mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 08:02:07 +00:00
a319a2773a
* '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
|
||
|---|---|---|
| .. | ||
| ibm_emac_core.c | ||
| ibm_emac_core.h | ||
| ibm_emac_debug.c | ||
| ibm_emac_debug.h | ||
| ibm_emac_mal.c | ||
| ibm_emac_mal.h | ||
| ibm_emac_phy.c | ||
| ibm_emac_phy.h | ||
| ibm_emac_rgmii.c | ||
| ibm_emac_rgmii.h | ||
| ibm_emac_tah.c | ||
| ibm_emac_tah.h | ||
| ibm_emac_zmii.c | ||
| ibm_emac_zmii.h | ||
| ibm_emac.h | ||
| Makefile | ||