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
..
e1000_ethtool.c	e1000, ixgb: Remove pointless wrappers	2006-09-19 15:27:07 -04:00
e1000_hw.c	e1000, ixgb: Remove pointless wrappers	2006-09-19 15:27:07 -04:00
e1000_hw.h	e1000: Add PCI ID 0x10a4 for our new 4-port PCI-Express device	2006-08-31 14:27:47 -07:00
e1000_main.c	Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2006-09-24 10:15:13 -07:00
e1000_osdep.h	e1000, ixgb: Remove pointless wrappers	2006-09-19 15:27:07 -04:00
e1000_param.c	e1000: Use module param array code	2006-08-28 14:56:32 -07:00
e1000.h	e1000: unify WoL capability detection code	2006-08-31 14:27:46 -07:00
LICENSE
Makefile