summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/coo...Linus Torvalds2008-04-241-1/+1
|\
| * [Blackfin] arch: finish removing remnants of old BF537_PORT_H option of Black...Mike Frysinger2008-04-241-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-04-2411-55/+121
|\ \ | |/ |/|
| * tun: Multicast handling in tun_chr_ioctl() needs proper locking.David S. Miller2008-04-241-0/+10
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville...David S. Miller2008-04-238-22/+82
| |\
| | * iwlwifi: Don't unlock priv->mutex if it isn't lockedRoland Dreier2008-04-232-2/+0
| | * wireless: rndis_wlan: modparam_workaround_interval is never below 0.Roel Kluin2008-04-231-2/+3
| | * prism54: prism54_get_encode() test below 0 on unsigned indexRoel Kluin2008-04-231-1/+1
| | * b43: Workaround DMA quirksMichael Buesch2008-04-231-8/+39
| | * ath5k: Fix radio identification on AR5424/2424Nick Kossifidis2008-04-231-4/+10
| | * b43: Add more btcoexist workaroundsMichael Buesch2008-04-231-4/+9
| | * b43: Fix HostFlags data typesMichael Buesch2008-04-232-3/+4
| | * b43: Workaround invalid bluetooth settingsMichael Buesch2008-04-231-2/+20
| * | iwlwifi: Fix built-in compilation of iwlcore (part 2)Zhu Yi2008-04-231-2/+1
| * | tun: Fix minor race in TUNSETLINK ioctl handling.David S. Miller2008-04-231-2/+9
| * | ppp_generic: use stats from net_device structurePaulius Zaleckas2008-04-231-29/+19
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-04-234-11/+17
|\ \ | |/
| * iwlwifi: Fix built-in compilation of iwlcoreTomas Winkler2008-04-231-1/+1
| * rt2x00: Select LEDS_CLASS.David S. Miller2008-04-231-5/+10
| * iwlwifi: Select LEDS_CLASS.David S. Miller2008-04-231-2/+6
| * hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.cMark Asselstine2008-04-211-3/+0
* | 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
OpenPOWER on IntegriCloud