Files
linux-legacy/include/linux
Linus Torvalds a319a2773a Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
  net/ieee80211: fix more crypto-related build breakage
  [PATCH] Spidernet: add ethtool -S (show statistics)
  [NET] GT96100: Delete bitrotting ethernet driver
  [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
  [PATCH] Cirrus Logic ep93xx ethernet driver
  r8169: the MMIO region of the 8167 stands behin BAR#1
  e1000, ixgb: Remove pointless wrappers
  [PATCH] Remove powerpc specific parts of 3c509 driver
  [PATCH] s2io: Switch to pci_get_device
  [PATCH] gt96100: move to pci_get_device API
  [PATCH] ehea: bugfix for register access functions
  [PATCH] e1000 disable device on PCI error
  drivers/net/phy/fixed: #if 0 some incomplete code
  drivers/net: const-ify ethtool_ops declarations
  [PATCH] ethtool: allow const ethtool_ops
  [PATCH] sky2: big endian
  [PATCH] sky2: fiber support
  [PATCH] sky2: tx pause bug fix
  drivers/net: Trim trailing whitespace
  [PATCH] ehea: IBM eHEA Ethernet Device Driver
  ...

Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a3 that just happened to be
next to unrelated changes in this update.
2006-09-24 10:15:13 -07:00
..
2006-08-03 16:56:02 -04:00
2006-09-07 15:57:12 +01:00
2006-09-11 13:32:30 -04:00
2006-09-23 21:03:52 -05:00
2006-06-27 17:32:38 -07:00
2006-09-22 23:24:30 -04:00
2006-09-22 15:18:17 -07:00
2006-06-26 09:58:36 -07:00
2006-07-03 19:44:51 -07:00
2006-07-01 09:56:03 -07:00
2006-06-23 02:07:36 -07:00
2006-09-22 15:18:47 -07:00
2006-08-27 11:01:32 -07:00
2006-06-25 10:01:19 -07:00
2006-07-28 21:02:00 -07:00
2006-07-03 15:27:03 -07:00
2006-07-03 15:27:03 -07:00
2006-06-20 20:24:58 -07:00
2006-08-21 10:02:50 +02:00
2006-09-22 14:53:32 -07:00
2006-09-22 15:20:25 -07:00
2006-07-31 13:28:39 -07:00
2006-06-21 12:40:49 -07:00
2006-07-03 15:27:00 -07:00
2006-07-14 21:53:56 -07:00
2006-09-05 17:20:21 -04:00
2006-07-14 21:53:55 -07:00
2006-06-25 10:01:13 -07:00
2006-09-22 14:54:20 -07:00
2006-08-27 11:01:32 -07:00
2006-06-25 10:01:09 -07:00
2006-09-23 15:33:43 -05:00
2006-07-12 16:05:48 -07:00
2006-08-19 17:44:31 -04:00
2006-06-28 15:54:27 -07:00
2006-07-03 19:48:25 -07:00
2006-06-23 07:42:49 -07:00
2006-06-25 10:01:06 -07:00
2006-06-25 10:01:06 -07:00
2006-06-25 10:01:14 -07:00
2006-06-30 11:25:38 -07:00
2006-09-22 14:55:02 -07:00
2006-09-01 11:39:08 -07:00
2006-09-22 14:53:36 -07:00
2006-06-30 11:25:37 -07:00
2006-06-23 07:43:06 -07:00
2006-09-22 15:20:25 -07:00
2006-06-30 18:25:18 +02:00
2006-07-03 23:30:54 +02:00
2006-08-06 08:57:47 -07:00
2006-07-10 13:24:25 -07:00