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
..
h	[PATCH] sk98lin: fix truncated collision threshold mask	2006-07-12 18:39:21 -04:00
Makefile	[PATCH] sk98lin: remove /proc interface	2005-12-01 02:22:52 -05:00
skaddr.c	[PATCH] drivers/net/sk98lin/: possible cleanups	2006-01-17 07:45:52 -05:00
skdim.c	spelling: s/usefull/useful/	2006-01-10 00:08:17 +01:00
skethtool.c	drivers/net: const-ify ethtool_ops declarations	2006-09-13 14:30:00 -04:00
skge.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
skgehwt.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
skgeinit.c	[PATCH] drivers/net/sk98lin/: possible cleanups	2006-01-17 07:45:52 -05:00
skgemib.c	[PATCH] drivers/net/sk98lin/: possible cleanups	2006-01-17 07:45:52 -05:00
skgepnmi.c	[PATCH] drivers/net/sk98lin/: possible cleanups	2006-01-17 07:45:52 -05:00
skgesirq.c	[PATCH] drivers/net/sk98lin/: possible cleanups	2006-01-17 07:45:52 -05:00
ski2c.c	[PATCH] drivers/net/sk98lin/: possible cleanups	2006-01-17 07:45:52 -05:00
sklm80.c	[PATCH] drivers/net/sk98lin/: possible cleanups	2006-01-17 07:45:52 -05:00
skqueue.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
skrlmt.c	[PATCH] drivers/net/sk98lin/: possible cleanups	2006-01-17 07:45:52 -05:00
sktimer.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
skvpd.c	typo fixes: infomation -> information	2006-06-30 18:25:18 +02:00
skxmac2.c	[PATCH] drivers/net/sk98lin/: possible cleanups	2006-01-17 07:45:52 -05:00