summaryrefslogtreecommitdiffstats
path: root/drivers/net (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nextJames Morris2008-11-1824-98/+498
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-1723-98/+494
| |\
| | * e1000e: fix IPMI trafficJeff Kirsher2008-11-173-2/+51
| | * e1000e: fix warn_on reload after phy_id errorJeff Kirsher2008-11-171-0/+1
| | * phy: fix phy address bugGiulio Benetti2008-11-161-2/+2
| | * e100: fix dma error in direction for mappingJesse Brandeburg2008-11-161-10/+10
| | * igb: use dev_printk instead of printkBjorn Helgaas2008-11-161-4/+3
| | * qla3xxx: Cleanup: Fix link print statements.Ron Mercer2008-11-161-14/+5
| | * igb: Use device_set_wakeup_enable\"Rafael J. Wysocki\2008-11-162-2/+7
| | * e1000: Use device_set_wakeup_enable\"Rafael J. Wysocki\2008-11-162-2/+7
| | * e1000e: Use device_set_wakeup_enable\"Rafael J. Wysocki\2008-11-162-2/+7
| | * via-velocity: enable perfect filtering for multicast packetsJoey Zhuo2008-11-161-1/+1
| | * phy: Add support for Marvell 88E1118 PHYRon Madrid2008-11-151-0/+66
| | * mlx4_en: Pause parameters per portYevgeny Petrilin2008-11-153-22/+24
| | * Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jga...David S. Miller2008-11-155-29/+15
| | |\
| | | * phylib: fix premature freeing of struct mii_busLennert Buytenhek2008-11-151-1/+1
| | | * atl1: Do not enumerate options unsupported by chipJ. K. Cliburn2008-11-151-14/+3
| | | * atl1e: fix broken multicast by removing unnecessary crc inversionJ. K. Cliburn2008-11-151-4/+0
| | | * gianfar: Fix DMA unmap invocationsAndy Fleming2008-11-151-7/+8
| | | * net/ucc_geth: Fix oops in uec_get_ethtool_stats()Anton Vorontsov2008-11-151-3/+3
| | * | niu: Bump driver version and release date.David S. Miller2008-11-141-2/+2
| | * | NIU: Add Sun CP3260 ATCA blade supportSantwona Behera2008-11-142-6/+293
| | |/
| * | USB: net: asix: add support for Cables-to-Go USB Ethernet adapterJason Cooper2008-11-131-0/+4
* | | Merge branch 'master' into nextJames Morris2008-11-1418-35/+82
|\| |
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-138-10/+28
| |\|
| | * bnx2: fix poll_controller to pass proper structures and check all rx queuesNeil Horman2008-11-131-3/+6
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2008-11-122-1/+7
| | |\
| | | * hostap: pad the skb->cb usage in lieu of a proper fixJohannes Berg2008-11-121-1/+4
| | | * rtl8187 : support for Sitecom WL-168 0001 v4Bob Jolliffe2008-11-121-0/+1
| | | * rtl8187: Add Abocom USB IDIvan Kuten2008-11-121-0/+2
| | * | niu: Fix readq implementation when architecture does not provide one.David S. Miller2008-11-121-2/+1
| | |/
| | * [netdrvr] smc911x: fix for driver resume (and compilation warning)Dasgupta, Romit2008-11-111-1/+3
| | * RDMA/cxgb3: deadlock in iw_cxgb3 can cause hang when configuring interface.Steve Wise2008-11-111-0/+2
| | * cxgb3 - Limit multiqueue setting to msi-xDivy Le Ray2008-11-111-1/+1
| | * cxgb3 - eeprom read fixesDivy Le Ray2008-11-111-1/+7
| | * myri10ge: fix stop/go ordering even moreBrice Goglin2008-11-111-1/+3
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2008-11-122-6/+5
| |\ \ | | |/ | |/|
| | *-. Merge branches 'cxgb3', 'ehca', 'ipath', 'ipoib', 'mlx4' and 'nes' into for-nextRoland Dreier2008-11-121-6/+3
| | |\ \
| | | | * mlx4_core: Fix unused variable warningRoland Dreier2008-11-041-6/+3
| | | |/
| | * / RDMA/cxgb3: Fix deadlock in iw_cxgb3 (hang when configuring interface)Steve Wise2008-11-121-0/+2
| | |/
| * | Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jga...David S. Miller2008-11-073-8/+10
| |\ \
| | * | [netdrvr] usb/hso: Cleanup rfkill error handlingJonathan McDowell2008-11-071-4/+6
| | * | sfc: Correct address of gPXE boot configuration in EEPROMBen Hutchings2008-11-071-2/+2
| | * | el3_common_init() should be __devinit, not __initAl Viro2008-11-071-3/+3
| | * | hso: rfkill type should be WWANPaulius Zaleckas2008-11-071-1/+1
| | * | mlx4_en: Start port error flow bug fixYevgeny Petrilin2008-11-071-1/+1
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-076-11/+39
| |\ \ \
| | * | | iwl3945: fix deadlock on suspendZhu, Yi2008-11-061-1/+1
| | * | | iwl3945: do not send scan command if channel count zeroReinette Chatre2008-11-061-0/+5
| | * | | iwl3945: clear scanning bits upon failureMohamed Abbas2008-11-061-0/+8