aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...Linus Torvalds2008-04-219-63/+612
|\
| * [POWERPC] QE: UCC nodes cleanupAnton Vorontsov2008-04-172-4/+15
| * [POWERPC] properly declare onstack completion in iseries vethBenjamin Herrenschmidt2008-04-171-1/+2
| * Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/olof...Paul Mackerras2008-04-171-2/+33
| |\
| | * pasemi_mac: Netpoll supportNate Case2008-04-071-0/+23
| | * pasemi_mac: Jumbo frame bugfixesOlof Johansson2008-04-071-2/+10
| * | Merge branch 'linux-2.6'Paul Mackerras2008-04-1467-716/+888
| |\ \ | | |/ | |/|
| * | [POWERPC] PS3: Gelic network driver Wake-on-LAN supportMasakazu Mokuno2008-04-012-0/+101
| * | Merge branch 'linux-2.6'Paul Mackerras2008-03-2631-209/+392
| |\ \
| * \ \ Merge branch 'linux-2.6'Paul Mackerras2008-03-1370-1535/+3018
| |\ \ \
| * | | | pasemi_mac: basic ethtool supportOlof Johansson2008-03-054-19/+189
| * | | | pasemi_mac: Enable GSO by defaultOlof Johansson2008-03-051-1/+1
| * | | | pasemi_mac: jumbo frame supportOlof Johansson2008-03-052-34/+275
| * | | | pasemi_mac: Move RX/TX section enablement to dma_libOlof Johansson2008-03-051-6/+0
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-02-2313-54/+115
| |\ \ \ \
* | \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6Linus Torvalds2008-04-212-8/+5
|\ \ \ \ \ \
| * | | | | | PM: Remove destroy_suspended_device()Rafael J. Wysocki2008-04-192-8/+5
* | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Linus Torvalds2008-04-214-11/+63
|\ \ \ \ \ \ \
| * | | | | | | drivers/net/appletalk: use time_before, time_before_eq, etcJulia Lawall2008-04-191-1/+2
| * | | | | | | tg3: 5701 DMA corruption fixMatt Carlson2008-04-192-4/+49
| * | | | | | | iwlwifi: Fix unconditional access to station->tidp[].agg.David S. Miller2008-04-191-6/+12
| |/ / / / / /
* | | | | | | Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/wil...Linus Torvalds2008-04-217-7/+2
|\ \ \ \ \ \ \
| * | | | | | | Convert asm/semaphore.h users to linux/semaphore.hMatthew Wilcox2008-04-182-2/+2
| * | | | | | | net: Remove unnecessary inclusions of asm/semaphore.hMatthew Wilcox2008-04-185-5/+0
| |/ / / / / /
* | | | | | | Merge branch 'merge-fixes' into develRussell King2008-04-19391-86379/+34214
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26Linus Torvalds2008-04-18375-86245/+33895
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2008-04-1711-72/+94
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/...David S. Miller2008-04-1757-3264/+2759
| | |\ \ \ \ \ \ \
| | | * | | | | | | [netdrvr] forcedeth: internal simplifications; changelog removalJeff Garzik2008-04-171-160/+74
| | | * | | | | | | phylib: factor out get_phy_id from within get_phy_devicePaul Gortmaker2008-04-171-9/+29
| | | * | | | | | | PHY: add BCM5464 support to broadcom PHY driverPaul Gortmaker2008-04-171-0/+20
| | | * | | | | | | cxgb3: Fix __must_check warning with dev_dbg.Dan Noe2008-04-171-2/+2
| | | * | | | | | | tc35815: Statistics cleanupAtsushi Nemoto2008-04-171-1/+2
| | | * | | | | | | natsemi: fix MMIO for PPC 44x platformsSergei Shtylyov2008-04-171-4/+6
| | | * | | | | | | e1000: convert uint16_t style integers to u16Joe Perches2008-04-165-1128/+1128
| | | * | | | | | | ixgb: convert uint16_t style integers to u16Joe Perches2008-04-167-302/+302
| | | * | | | | | | sb1000.c: make const arrays staticDenys Vlasenko2008-04-161-18/+29
| | | * | | | | | | sb1000.c: stop inlining largish static functionsDenys Vlasenko2008-04-161-27/+27
| | | * | | | | | | #if 0 netxen_nic_link_ok()Adrian Bunk2008-04-162-1/+2
| | | * | | | | | | make netxen_workq staticAdrian Bunk2008-04-162-18/+18
| | | * | | | | | | e1000e: reformat register test code, fix some minor initializationBruce Allan2008-04-161-60/+63
| | | * | | | | | | e1000e: rename a few functionsJeff Kirsher2008-04-166-18/+18
| | | * | | | | | | e1000e: Make arrays out of these Rx/Tx registersJeff Kirsher2008-04-165-48/+50
| | | * | | | | | | e1000e: limit EEPROM size accessesJeff Kirsher2008-04-162-0/+8
| | | * | | | | | | sc92031: use netdev_alloc_skbStephen Hemminger2008-04-161-1/+1
| | | * | | | | | | sc92031: start transmit return value bugfixStephen Hemminger2008-04-161-10/+4
| | | * | | | | | | sc92031: use net_device statsStephen Hemminger2008-04-161-36/+34
| | | * | | | | | | [netdrvr] tulip: Better MWI workaround for 21143 rev 65 chip errataPeter Horton2008-04-162-15/+11
| | | * | | | | | | [netdrvr] tulip/winbond-840: don't let tulip.h symbol stomp oursJeff Garzik2008-04-161-2/+3
| | | * | | | | | | drivers/net/bonding/bond_main.c - remove unnecessary #defineJoe Perches2008-04-161-2/+0