mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 12:21:37 +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
|
||
|---|---|---|
| .. | ||
| act200l-sir.c | ||
| act200l.c | ||
| actisys-sir.c | ||
| actisys.c | ||
| ali-ircc.c | ||
| ali-ircc.h | ||
| au1k_ir.c | ||
| au1000_ircc.h | ||
| donauboe.c | ||
| donauboe.h | ||
| ep7211_ir.c | ||
| esi-sir.c | ||
| esi.c | ||
| girbil-sir.c | ||
| girbil.c | ||
| irda-usb.c | ||
| irda-usb.h | ||
| irport.c | ||
| irport.h | ||
| irtty-sir.c | ||
| irtty-sir.h | ||
| Kconfig | ||
| litelink-sir.c | ||
| litelink.c | ||
| ma600-sir.c | ||
| ma600.c | ||
| Makefile | ||
| mcp2120-sir.c | ||
| mcp2120.c | ||
| mcs7780.c | ||
| mcs7780.h | ||
| nsc-ircc.c | ||
| nsc-ircc.h | ||
| old_belkin-sir.c | ||
| old_belkin.c | ||
| pxaficp_ir.c | ||
| sa1100_ir.c | ||
| sir_dev.c | ||
| sir_dongle.c | ||
| sir-dev.h | ||
| smsc-ircc2.c | ||
| smsc-ircc2.h | ||
| smsc-sio.h | ||
| stir4200.c | ||
| tekram-sir.c | ||
| tekram.c | ||
| toim3232-sir.c | ||
| via-ircc.c | ||
| via-ircc.h | ||
| vlsi_ir.c | ||
| vlsi_ir.h | ||
| w83977af_ir.c | ||
| w83977af_ir.h | ||
| w83977af.h | ||