summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-06-1218-54/+78
|\
| * r8169: fix crash when large packets are receivedEric Dumazet2009-06-091-6/+5
| * e1000: add missing length check to e1000 receive routineNeil Horman2009-06-021-2/+3
| * forcedeth: add phy_power_down parameter, leave phy powered up by default (v2)Ed Swierk2009-06-021-2/+13
| * 3c509: Add missing EISA IDsMaciej W. Rozycki2009-06-011-0/+4
| * ath1e: add new device id for asus hardwareGreg Kroah-Hartman2009-05-291-0/+1
| * mlx4_en: Fix a kernel panic when waking tx queueYevgeny Petrilin2009-05-291-4/+4
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-05-293-6/+9
| |\
| | * rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongleJohn W. Linville2009-05-292-0/+3
| | * at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scanJohn W. Linville2009-05-291-6/+6
| * | mac8390: fix build with NET_POLL_CONTROLLERFinn Thain2009-05-291-1/+1
| * | cxgb3: link fault fixesDivy Le Ray2009-05-292-3/+10
| * | cxgb3: fix dma mapping regressionDivy Le Ray2009-05-292-8/+7
| |/
| * bfin_mac: fix build error due to net_device_ops convertMike Frysinger2009-05-261-15/+14
| * atlx: move modinfo data from atlx.h to atl1.cAlex Chiang2009-05-262-6/+6
| * gianfar: fix babbling rx error event bugXiaotian Feng2009-05-261-1/+1
* | 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
| |/