summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge' into nextBenjamin Herrenschmidt2009-05-2921-155/+226
|\
| * Merge branch 'linux-2.6.30.y' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2009-05-251-5/+30
| |\
| | * wimax/i2400m: usb: fix device reset on autosuspend while not yet idleInaky Perez-Gonzalez2009-05-221-5/+30
| * | r8169: avoid losing MSI interruptsDavid Dillow2009-05-251-45/+57
| * | mac8390: fix regression caused during net_device_ops conversionFinn Thain2009-05-252-6/+6
| * | gianfar: fix BUG under load after introduction of skb recyclingLennert Buytenhek2009-05-251-1/+10
| |/
| * wireless: beyond ARRAY_SIZE of intf->crypto_statsRoel Kluin2009-05-201-1/+1
| * iwlwifi: update 5000 ucode support to version 2 of APIJay Sternberg2009-05-201-1/+1
| * airo: fix airo_get_encode{,ext} buffer overflow like I mean it...John W. Linville2009-05-201-9/+14
| * ath5k: fix interpolation with equal power levelsFabio Rossi2009-05-201-21/+28
| * iwlwifi: do not cancel delayed work inside spin_lock_irqsaveReinette Chatre2009-05-203-17/+6
| * ath5k: fix exp off-by-one when computing OFDM delta slopeForrest Zhang2009-05-201-3/+3
| * ath5k: fix scanning in AR2424Pavel Roskin2009-05-201-1/+1
| * be2net: add two new pci device ids to pci device tableAjit Khaparde2009-05-182-5/+19
| * Neterion: *FIFO1_DMA_ERR set twice, should 2nd be *FIFO2_DMA_ERR?roel kluin2009-05-171-1/+1
| * mv643xx_eth: fix PPC DMA breakageGabriel Paubert2009-05-171-19/+22
| * bonding: fix link down handling in 802.3ad modeStephen Hemminger2009-05-171-3/+8
| * Merge branch 'linux-2.6.30.y' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2009-05-171-3/+2
| |\
| | * wimax/i2400m: fix device crash: fix optimization in _roq_queue_update_wsInaky Perez-Gonzalez2009-05-141-3/+2
| * | NET: Meth: Fix unsafe mix of irq and non-irq spinlocks.Ralf Baechle2009-05-171-13/+14
| * | mlx4_en: Fix not deleted napi structuresYevgeny Petrilin2009-05-171-1/+3
* | | net/ucc_geth: Assign six threads to Rx for UECHaiying Wang2009-05-191-1/+9
* | | net/ucc_geth: update riscTx and riscRx in ucc_gethHaiying Wang2009-05-192-5/+13
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6Linus Torvalds2009-05-157-31/+89
|\ \
| * | iwlwifi: fix device id registration for 6000 series 2x2 devicesJay Sternberg2009-05-112-4/+6
| * | ath5k: update channel in sw state after stopping RX and TXBob Copeland2009-05-111-9/+13
| * | rtl8187: use DMA-aware buffers with usb_control_msgJohn W. Linville2009-05-113-16/+62
| * | airo: airo_get_encode{,ext} potential buffer overflowJohn W. Linville2009-05-111-2/+8
| |/
* | Remove unreached code in drivers/net/mlx4/en_rx.cDan Carpenter2009-05-121-1/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-05-107-45/+38
|\|
| * Merge branch 'net-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/chr...David S. Miller2009-05-092-17/+18
| |\
| | * IXP4xx: complete Ethernet netdev setup before calling register_netdev().Krzysztof Hałasa2009-05-091-12/+13
| | * IXP4xx: use "ENODEV" instead of "ENOSYS" in module initialization.Krzysztof Hałasa2009-05-092-5/+5
| * | bonding: fix panic if initialization failsFlorian Westphal2009-05-091-8/+0
| |/
| * bnx2: Fix panic in bnx2_poll_work().Michael Chan2009-05-061-2/+4
| * igb: resolve panic on shutdown when SR-IOV is enabledAlexander Duyck2009-05-061-7/+5
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-05-052-11/+11
| |\
| | * iwlwifi: update key flags at time key is setReinette Chatre2009-05-041-10/+11
| | * iwlwifi: remove EXPORT_SYMBOL for static symbolAndreas Schwab2009-05-041-1/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-05-0519-82/+504
|\| |
| * | e1000: fix virtualization bugJesse Brandeburg2009-05-041-1/+1
| * | bonding: fix alb mode locking regressionJay Vosburgh2009-05-041-9/+3
| * | usbnet: CDC EEM support (v5)Omar Laazimani2009-05-043-0/+396
| * | ehea: fix invalid pointer accessHannes Hering2009-05-042-14/+19
| |/
| * ne2k-pci: Do not register device until initialized.Lubomir Rintel2009-05-021-4/+3
| * virtio_net: Fix function name typoAlex Williamson2009-05-011-4/+4
| * virtio_net: Cleanup command queue scatterlist usageAlex Williamson2009-05-011-6/+10
| * bonding: correct the cleanup in bond_create()Jiri Pirko2009-05-011-7/+6
| * smsc95xx: add support for LAN9512 and LAN9514Steve Glendinning2009-05-011-0/+5
| * smsc95xx: configure LED outputsSteve Glendinning2009-05-012-0/+13