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: (40 commits) r8169: prevent bit sign expansion error in mdio_write r8169: revert 7da97ec9 (bis repetita) sky2: new pci id's ax88796: add superh to kconfig dependencies qla3xxx: bugfix: Fix bad logical operation in link state machine. qla3xxx: bugfix: Move link state machine into a worker thread pasemi_mac: Fix CRC checks pasemi_mac: Don't set replace-source-address descriptor bits bonding: don't validate address at device open bonding: fix rtnl locking merge error sky2: netpoll on port 0 only b43: Fix kconfig dependencies for rfkill and leds b43legacy: Fix sparse warning b43: properly request pcmcia IRQ b43legacy: fix shared IRQ race condition b43: fix shared IRQ race condition b43legacy: add me as maintainer and fix URLs b43legacy: fix possible buffer overrun in debugfs b43: Rewrite and fix rfkill init b43: debugfs SHM read buffer overrun fix ...
Showing
- MAINTAINERS 6 additions, 4 deletionsMAINTAINERS
- drivers/net/Kconfig 1 addition, 1 deletiondrivers/net/Kconfig
- drivers/net/bonding/bond_main.c 1 addition, 0 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/bonding/bond_sysfs.c 2 additions, 2 deletionsdrivers/net/bonding/bond_sysfs.c
- drivers/net/pasemi_mac.c 14 additions, 4 deletionsdrivers/net/pasemi_mac.c
- drivers/net/qla3xxx.c 18 additions, 24 deletionsdrivers/net/qla3xxx.c
- drivers/net/qla3xxx.h 1 addition, 0 deletionsdrivers/net/qla3xxx.h
- drivers/net/r8169.c 7 additions, 19 deletionsdrivers/net/r8169.c
- drivers/net/sky2.c 70 additions, 46 deletionsdrivers/net/sky2.c
- drivers/net/sky2.h 2 additions, 1 deletiondrivers/net/sky2.h
- drivers/net/smc91x.h 15 additions, 0 deletionsdrivers/net/smc91x.h
- drivers/net/wireless/Kconfig 1 addition, 1 deletiondrivers/net/wireless/Kconfig
- drivers/net/wireless/b43/Kconfig 6 additions, 4 deletionsdrivers/net/wireless/b43/Kconfig
- drivers/net/wireless/b43/debugfs.c 1 addition, 1 deletiondrivers/net/wireless/b43/debugfs.c
- drivers/net/wireless/b43/main.c 10 additions, 9 deletionsdrivers/net/wireless/b43/main.c
- drivers/net/wireless/b43/pcmcia.c 33 additions, 19 deletionsdrivers/net/wireless/b43/pcmcia.c
- drivers/net/wireless/b43/rfkill.c 52 additions, 63 deletionsdrivers/net/wireless/b43/rfkill.c
- drivers/net/wireless/b43/rfkill.h 4 additions, 10 deletionsdrivers/net/wireless/b43/rfkill.h
- drivers/net/wireless/b43legacy/debugfs.c 1 addition, 1 deletiondrivers/net/wireless/b43legacy/debugfs.c
- drivers/net/wireless/b43legacy/main.c 12 additions, 9 deletionsdrivers/net/wireless/b43legacy/main.c
Loading
Please register or sign in to comment