aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2008-12-301-1/+6
|\
| * [SCSI] cxgb3i: fix select/depend problemJames Bottomley2008-12-301-1/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-12-3015-87/+102
|\ \
| * | drivers/net/usb: use USB API functions rather than constantsJulia Lawall2008-12-292-3/+2
| * | EtherExpress16: fix printing timed out statusRoel Kluin2008-12-291-28/+28
| * | mlx4_en: Added "set_ringparam" Ethtool interface implementationYevgeny Petrilin2008-12-293-33/+61
| * | mlx4_en: Always allocate RX ring for each interrupt vectorYevgeny Petrilin2008-12-292-13/+4
| * | mlx4_en: Verify number of RX rings doesn't exceed MAX_RX_RINGSYevgeny Petrilin2008-12-291-1/+2
| * | net: KS8695: removed duplicated #includeHuang Weiyi2008-12-291-1/+0
| * | tun: Fix SIOCSIFHWADDR error.Kusanagi Kouichi2008-12-291-1/+1
| * | smsc911x: compile fix re netif_rx signature changesAlexey Dobriyan2008-12-291-2/+2
| * | net: Fix more NAPI interface netdev argument drop fallout.Kamalesh Babulal2008-12-293-3/+3
| * | net: Fix unused variable warnings in pasemi_mac.c and spider_net.cDavid S. Miller2008-12-282-3/+0
| |/
* | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-12-305-8/+52
|\ \ | |/ |/|
| * Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/l...Russell King2008-12-172-58/+95
| |\
| * \ Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/gi...Russell King2008-12-1529-59/+221
| |\ \
| * \ \ Merge git://git.marvell.com/orion into develRussell King2008-12-139-21/+67
| |\ \ \
| * \ \ \ Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmia...Russell King2008-12-022-0/+46
| |\ \ \ \
| | * | | | [ARM] pxa: move UART register definitions into dedicated regs-uart.hEric Miao2008-12-021-0/+1
| | * | | | [ARM] pxa: move FICP register definitions into pxaficp_ir.cEric Miao2008-12-021-0/+42
| | * | | | [ARM] pxa: explicit #include <mach/dma.h> in various driversEric Miao2008-12-021-0/+3
| * | | | | [ARM] fix missing includes for iop33x and sa1100_irRussell King2008-12-011-1/+1
| * | | | | [ARM] Hide ISA DMA API when ISA_DMA_API is unsetRussell King2008-11-292-2/+2
| * | | | | [ARM] pxa: avoid polluting the kernel's namespaceRussell King2008-11-282-0/+2
| * | | | | [ARM] clps7500: remove supportRussell King2008-11-271-5/+1
| |/ / / /
* | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/p...Linus Torvalds2008-12-281-4/+1
|\ \ \ \ \
| * | | | | powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driverWolfram Sang2008-12-211-4/+1
| | |_|_|/ | |/| | |
* | | | | net: ehea NAPI interface cleanup fixStephen Rothwell2008-12-282-2/+2
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2008-12-28690-35468/+53535
|\ \ \ \ \
| * | | | | net: Allow dependancies of FDDI & Tokenring to be modular.Dave Jones2008-12-272-2/+2
| * | | | | igb: Fix build warning when DCA is disabled.David S. Miller2008-12-261-2/+1
| * | | | | net: Fix warning fallout from recent NAPI interface changes.David S. Miller2008-12-2610-13/+0
| * | | | | sfc: If AN is enabled, always read speed/duplex from the AN advertising bitsBen Hutchings2008-12-261-7/+10
| * | | | | sfc: When disabling the NIC, close the device rather than unregistering itBen Hutchings2008-12-261-24/+23
| * | | | | sfc: SFT9001: Add cable diagnosticsBen Hutchings2008-12-261-8/+107
| * | | | | sfc: Add support for multiple PHY self-testsBen Hutchings2008-12-265-15/+44
| * | | | | sfc: Merge top-level functions for self-testsBen Hutchings2008-12-263-55/+48
| * | | | | sfc: Clean up PHY mode management in loopback self-testBen Hutchings2008-12-261-12/+7
| * | | | | sfc: Fix unreliable link detection in some loopback modesBen Hutchings2008-12-263-13/+24
| * | | | | sfc: Generate unique names for per-NIC workqueuesBen Hutchings2008-12-262-1/+6
| * | | | | 802.3ad: use standard ethhdr instead of ad_headerHolger Eitzenberger2008-12-262-18/+8
| * | | | | 802.3ad: generalize out mac address initializerHolger Eitzenberger2008-12-262-11/+14
| * | | | | 802.3ad: initialize ports LACPDU from const initializerHolger Eitzenberger2008-12-261-49/+12
| * | | | | 802.3ad: remove typedef around ad_systemHolger Eitzenberger2008-12-261-3/+3
| * | | | | 802.3ad: turn ports is_individual into a boolHolger Eitzenberger2008-12-262-4/+4
| * | | | | 802.3ad: turn ports is_enabled into a boolHolger Eitzenberger2008-12-262-4/+5
| * | | | | 802.3ad: make ntt boolHolger Eitzenberger2008-12-262-11/+13
| * | | | | ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.Peter P Waskiewicz Jr2008-12-261-34/+30
| * | | | | ixgbe: Fix NAPI enable/disable path when using DCBPeter P Waskiewicz Jr2008-12-262-5/+10
| * | | | | igb: re-order queues to support cleaner use of ivar on 82576Alexander Duyck2008-12-262-39/+79