summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2008-07-252-41/+153
|\
| * ibmveth: enable driver for CMORobert Jennings2008-07-252-34/+140
| * ibmveth: Automatically enable larger rx buffer pools for larger mtuSantiago Leon2008-07-251-7/+13
* | virtio: Recycle unused recv buffer pages for large skbs in net driverRusty Russell2008-07-251-1/+35
* | virtio net: Allow receiving SG packetsHerbert Xu2008-07-251-5/+39
* | virtio net: Add ethtool ops for SG/GSOHerbert Xu2008-07-251-0/+18
* | virtio: fix virtio_net xmit of freed skb bugMark McLoughlin2008-07-251-10/+10
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2008-07-247-21/+61
|\
| * mlx4_core: Improve error message when not enough UAR pages are availableRoland Dreier2008-07-231-0/+7
| * IB/mlx4: Add support for memory management extensions and local DMA L_KeyRoland Dreier2008-07-234-13/+24
| * mlx4_core: Keep free count for MTT buddy allocatorRoland Dreier2008-07-222-8/+19
| * mlx4_code: Add missing FW status return codeJack Morgenstein2008-07-221-0/+3
| * mlx4_core: Add module parameter to enable QoS supportJack Morgenstein2008-07-221-0/+8
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger...Linus Torvalds2008-07-241-53/+1
|\ \
| * | m68knommu: remove last use of CONFIG_FADS and CONFIG_RPXCLASSICGreg Ungerer2008-07-231-1/+1
| * | m68knommu: remove RPXCLASSIC from the m68k treeSebastian Siewior2008-07-231-42/+0
| * | m68knommu: fec: remove FADSSebastian Siewior2008-07-231-10/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-07-242-7/+0
|\ \ \
| * | | e1000e: fix e1000_netpoll(), remove extraneous e1000_clean_tx_irq() callIngo Molnar2008-07-231-2/+0
| * | | sky2: don't stop queue on shutdownStephen Hemminger2008-07-221-5/+0
| |/ /
* | | PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architecturesAndrea Righi2008-07-241-0/+1
* | | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-232-82/+88
|\ \ \ | |/ / |/| |
| * | Merge branch 'pxa' into develRussell King2008-07-133-106/+88
| |\ \
| | * | [ARM] pxa: make littleton to use the new smc91x platform dataEric Miao2008-07-121-1/+2
| | * | [ARM] pxa: make zylonite to use the new smc91x platform dataEric Miao2008-07-121-17/+2
| | * | [ARM] pxa: make mainstone to use the new smc91x platform dataEric Miao2008-07-121-6/+27
| | * | [ARM] pxa: make lubbock to use new smc91x platform dataEric Miao2008-07-121-2/+1
| | * | [NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform dataEric Miao2008-07-122-8/+11
| | * | [NET] smc91x: prepare for SMC_IO_SHIFT to be a platform configurable variableEric Miao2008-07-122-26/+34
| | * | [NET] smc91x: add SMC91X_NOWAIT flag to platform dataEric Miao2008-07-121-1/+2
| | * | [NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_*Eric Miao2008-07-122-19/+6
| | * | [NET] smc91x: remove "irq_flags" from "struct smc91x_platdata"Eric Miao2008-07-121-4/+5
| | * | Merge branch 'machtypes' into pxa-palmRussell King2008-07-09126-1227/+1803
| | |\ \
* | | \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-07-2265-4115/+11885
|\ \ \ \ \
| * | | | | ipw2200: Call netif_*_queue() interfaces properly.David S. Miller2008-07-221-31/+2
| * | | | | netxen: Needs to include linux/vmalloc.hDavid S. Miller2008-07-221-0/+1
| * | | | | Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/...David S. Miller2008-07-221-1/+1
| |\ \ \ \ \
| | * | | | | [netdrvr] atl1d: fix !CONFIG_PM buildJeff Garzik2008-07-221-1/+1
| * | | | | | Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/...David S. Miller2008-07-2251-4053/+11854
| |\| | | | |
| | * | | | | r6040: rework init_one error handlingFlorian Fainelli2008-07-221-19/+25
| | * | | | | r6040: bump release number to 0.18Florian Fainelli2008-07-221-2/+2
| | * | | | | r6040: handle RX fifo full and no descriptor interruptsFlorian Fainelli2008-07-221-7/+15
| | * | | | | r6040: change the default waiting timeFlorian Fainelli2008-07-221-2/+2
| | * | | | | r6040: use definitions for magic values in descriptor statusFlorian Fainelli2008-07-221-11/+26
| | * | | | | r6040: completely rework the RX pathFlorian Fainelli2008-07-221-82/+62
| | * | | | | r6040: call napi_disable when puting down the interface and set lp->dev accor...Florian Fainelli2008-07-221-2/+2
| | * | | | | mv643xx_eth: fix NETPOLL buildLennert Buytenhek2008-07-221-1/+1
| | * | | | | r6040: rework the RX buffers allocation routineFlorian Fainelli2008-07-221-9/+44
| | * | | | | r6040: fix scheduling while atomic in r6040_tx_timeoutFlorian Fainelli2008-07-221-41/+58
| | * | | | | r6040: fix null pointer access and tx timeoutsFlorian Fainelli2008-07-221-8/+20