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
..
common.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cphy.h	Update Chelsio gige net driver.	2005-06-23 01:40:19 -04:00
cpl5_cmd.h	Update Chelsio gige net driver.	2005-06-23 01:40:19 -04:00
cxgb2.c	drivers/net: const-ify ethtool_ops declarations	2006-09-13 14:30:00 -04:00
elmer0.h	Update Chelsio gige net driver.	2005-06-23 01:40:19 -04:00
espi.c	[PATCH] chelsio/espi.c:tricn_init(): remove dead code	2006-03-11 20:32:17 -05:00
espi.h	Update Chelsio gige net driver.	2005-06-23 01:40:19 -04:00
gmac.h	Update Chelsio gige net driver.	2005-06-23 01:40:19 -04:00
Makefile	kbuild: fix unneeded rebuilds in drivers/net/chelsio after moving source tree	2006-04-04 16:51:41 +02:00
mv88x201x.c	Update Chelsio gige net driver.	2005-06-23 01:40:19 -04:00
pm3393.c	Update Chelsio gige net driver.	2005-06-23 01:40:19 -04:00
regs.h	Update Chelsio gige net driver.	2005-06-23 01:40:19 -04:00
sge.c	[NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE	2006-09-22 14:53:53 -07:00
sge.h	[PATCH] chelsio: transmit routine return values	2005-12-24 09:35:17 -05:00
subr.c	Massive net driver const-ification.	2006-03-03 21:33:57 -05:00
suni1x10gexp_regs.h	Update Chelsio gige net driver.	2005-06-23 01:40:19 -04:00