You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		19 years ago
..
Makefile	kbuild: fix unneeded rebuilds in drivers/net/chelsio after moving source tree	19 years ago
common.h	Remove obsolete #include <linux/config.h>	19 years ago
cphy.h	Update Chelsio gige net driver.	20 years ago
cpl5_cmd.h	Update Chelsio gige net driver.	20 years ago
cxgb2.c	drivers/net: const-ify ethtool_ops declarations	19 years ago
elmer0.h	Update Chelsio gige net driver.	20 years ago
espi.c	[PATCH] chelsio/espi.c:tricn_init(): remove dead code	19 years ago
espi.h	Update Chelsio gige net driver.	20 years ago
gmac.h	Update Chelsio gige net driver.	20 years ago
mv88x201x.c	Update Chelsio gige net driver.	20 years ago
pm3393.c	Update Chelsio gige net driver.	20 years ago
regs.h	Update Chelsio gige net driver.	20 years ago
sge.c	[NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE	19 years ago
sge.h	[PATCH] chelsio: transmit routine return values	19 years ago
subr.c	Massive net driver const-ification.	19 years ago
suni1x10gexp_regs.h	Update Chelsio gige net driver.	20 years ago