summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2009-03-302-33/+1
|\
| * MIPS: Alchemy: PB1200: use SMC91X platform data.Manuel Lauss2009-03-301-32/+0
| * MIPS: Stop using <asm-generic/int-l64.h>.Ralf Baechle2009-03-301-1/+1
* | Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-03-30689-79428/+96817
|\ \ | |/
| * Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-03-285-14/+17
| |\
| | * Merge branch 'origin' into develRussell King2009-03-28685-79393/+96771
| | |\
| | * \ Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmli...Russell King2009-03-2543-289/+5843
| | |\ \
| | * | | [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.hRussell King2009-03-251-1/+1
| | * | | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...root2009-03-241-0/+1
| | |\ \ \
| | | * | | [ARM] pxa/aspenite: add support for debug ethernetEric Miao2009-03-231-0/+1
| | * | | | Merge branch 'for-russell' of git://git.kernel.org/pub/scm/linux/kernel/git/c...Russell King2009-03-171-7/+13
| | |\ \ \ \
| | | * | | | IXP4xx: add Ethernet and NPE support for IXP43x CPU.Krzysztof Hałasa2009-03-171-7/+13
| | * | | | | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into develRussell King2009-03-1374-9133/+14399
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | [ARM] pxa: separate definitions from pxa-regs.h and remove it finallyEric Miao2009-03-091-2/+1
| | * | | | | [ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.hEric Miao2009-03-092-4/+1
| * | | | | | Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm...Linus Torvalds2009-03-284-20/+28
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'linus' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-28119-1321/+9557
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-274-20/+28
| | |\ \ \ \ \ \
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | *-----. \ \ \ \ \ Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x...Ingo Molnar2009-03-0421-139/+285
| | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch 'x86/urgent' into x86/patIngo Molnar2009-03-011-4/+4
| | | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | | | | | | | | | |
| | | | \ \ \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ \ \ Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linu...Ingo Molnar2009-02-2621-19/+5163
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | | | | | | | | | | | |
| | | | \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \
| | | *-----. \ \ \ \ \ \ \ \ \ \ Merge branches 'x86/acpi', 'x86/apic', 'x86/cpudetect', 'x86/headers', 'x86/p...Ingo Molnar2009-02-1728-8955/+8879
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | | \ \ \ \ \ \ \ \ \ \
| | | | | | *-----------. \ \ \ \ \ \ \ \ \ \ Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/...Ingo Molnar2009-02-133-15/+16
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | / / / / / / / / / | | | | | | | | | | | |_|_|/ / / / / / / / / | | | | | | | | | | |/| | | | | / / / / / / | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | arlan-main.c fix compilation warnings for phys_addr_tJaswinder Singh Rajput2009-02-111-2/+2
| | | | | | | | | | | * | | | | | | | | | ne3210.c fix compilation warning for phys_addr_tJaswinder Singh Rajput2009-02-111-1/+2
| | | | | | | | | | | * | | | | | | | | | falcon fix compilation warningsJaswinder Singh Rajput2009-02-111-12/+12
| | | | |_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge commit 'v2.6.29-rc5' into x86/apicIngo Molnar2009-02-1517-8887/+8751
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch 'linus' into x86/apicIngo Molnar2009-02-1327-83/+159
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch 'x86/urgent' into x86/apicIngo Molnar2009-02-0536-364/+409
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch 'core/percpu' into x86/coreIngo Molnar2009-01-281-5/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into core/percpuIngo Molnar2009-01-2744-386/+582
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|/ / / / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Merge branch 'x86/mm' into core/percpuIngo Molnar2009-01-2154-581/+797
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'cpus4096', 'x86/cleanups' and 'x86/urgent' into x86/percpuIngo Molnar2009-01-151-5/+12
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | cpumask: convert drivers/net/sfcRusty Russell2009-01-111-4/+11
| | | | | | * | | | | | | | | | | | | | | | | cpumask: Use topology_core_cpumask()/topology_thread_cpumask()Rusty Russell2009-01-111-2/+2
| | | | | | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2009-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | [SCSI] net: reclaim 8 upper bits of the netdev->features from GSOChris Leech2009-03-131-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifiJohannes Berg2009-03-279-17/+71
| * | | | | | | | | | | | | | | | | | | | mac80211: unify and fix TX aggregation startJohannes Berg2009-03-271-1/+1
| * | | | | | | | | | | | | | | | | | | | iwlwifi: show current driver status in user readable formatWey-Yi Guy2009-03-271-1/+53
| * | | | | | | | | | | | | | | | | | | | ath5k: properly drop packets from ops->txBob Copeland2009-03-271-4/+6
| * | | | | | | | | | | | | | | | | | | | ar9170: single module buildChristian Lamparter2009-03-276-60/+7
| * | | | | | | | | | | | | | | | | | | | ath9k: fix dma mapping leak of rx buffer upon rmmodLuis R. Rodriguez2009-03-271-1/+6
| * | | | | | | | | | | | | | | | | | | | rt2x00: New USB ID for rt73usbIvo van Doorn2009-03-271-0/+2
| * | | | | | | | | | | | | | | | | | | | ath5k: warn and correct rate for unknown hw rate indexesBob Copeland2009-03-272-4/+13
| * | | | | | | | | | | | | | | | | | | | b43: fix b43_plcp_get_bitrate_idx_ofdm return typeLorenzo Nava2009-03-271-1/+1
| * | | | | | | | | | | | | | | | | | | | p54: Kconfig maintenanceChristian Lamparter2009-03-271-28/+4
| * | | | | | | | | | | | | | | | | | | | ar9170: simplify & deBUG tx_status queueing and reportingChristian Lamparter2009-03-273-103/+49
| * | | | | | | | | | | | | | | | | | | | ath5k: Support LED's on Acer Extensa 5620zTulio Magno Quites Machado Filho2009-03-271-0/+2
| * | | | | | | | | | | | | | | | | | | | ar9170: update Makefile, Kconfig and MAINTAINERSChristian Lamparter2009-03-274-0/+35
OpenPOWER on IntegriCloud