summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-128-10/+28
|\
| * bnx2: fix poll_controller to pass proper structures and check all rx queuesNeil Horman2008-11-121-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-066-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
| * | | ath5k: correct handling of rx status fieldsBob Copeland2008-11-061-8/+8
| * | | zd1211rw: Add 2 device IDsDaniel Drake2008-11-061-0/+2
| * | | iwlagn: avoid sleep in softirq contextJohn W. Linville2008-11-061-1/+5
| * | | iwlwifi: clear scanning bits upon failureMohamed Abbas2008-11-061-0/+7
| * | | Revert "ath5k: honor FIF_BCN_PRBRESP_PROMISC in STA mode"John W. Linville2008-11-061-1/+3
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-048-22/+40
|\| |
| * | niu: Use pci_ioremap_bar().David S. Miller2008-11-031-5/+1
| * | bnx2x: Version UpdateEilon Greenstein2008-11-031-2/+2
| * | bnx2x: Calling netif_carrier_off at the end of the probeEilon Greenstein2008-11-031-2/+2
| * | bnx2x: PCI configuration bug on big-endianEilon Greenstein2008-11-031-4/+5
| * | bnx2x: Removing the PMF indication when unloadingEilon Greenstein2008-11-031-0/+2
| * | mv643xx_eth: fix SMI bus access timeoutsLennert Buytenhek2008-11-031-3/+6
| * | net: kconfig cleanupJeff Kirsher2008-11-031-3/+15
| * | fs_enet: fix pollingAlexey Dobriyan2008-11-031-2/+4
| * | SMC91x: Fix compilation on some platforms.David S. Miller2008-11-031-0/+2
| * | drivers/net/smc911x.c: Fix lockdep warning on xmit.Will Newton2008-11-021-1/+1
* | | drivers: remove duplicated #includeJianjun Kong2008-11-042-2/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-0224-76/+119
|\| |
| * | IRDA: remove double inclusion of module.hAlexander Beregalov2008-11-012-2/+0
| * | net: Really remove all of LOOPBACK_TSO code.David S. Miller2008-10-311-9/+0
| * | net: delete excess kernel-doc notationRandy Dunlap2008-10-301-1/+0
| * | Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jga...David S. Miller2008-10-3011-36/+99
| |\ \
| | * | gianfar: Don't reset TBI<->SerDes link if it's already upTrent Piepho2008-10-311-0/+9
| | * | gianfar: Fix race in TBI/SerDes configurationTrent Piepho2008-10-313-0/+31