FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-13 04:41:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/arch/mips
History
David S. Miller f6a1ad4295 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/vmxnet3/vmxnet3_drv.c

Small vmxnet3 conflict with header size bug fix in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-03-05 21:16:26 -05:00
..
alchemy
MIPS: Alchemy: Increase minimum timeout for 32kHz timer.
2012-02-20 18:33:18 +01:00
ar7
Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next
2012-01-11 15:42:31 +01:00
ath79
MIPS: ATH79: Avoid a kernel bug on AR913X
2012-02-20 18:33:19 +01:00
bcm47xx
MIPS: Fix up inconsistency in panic() string argument.
2011-12-07 22:01:45 +00:00
bcm63xx
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
boot
MIPS: Alchemy: Basic support for the DB1300 board.
2011-12-07 22:02:06 +00:00
cavium-octeon
Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next
2012-01-11 15:42:31 +01:00
cobalt
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
configs
MIPS: PowerTV: Fix defconfigs for coverage builds
2012-02-20 18:33:20 +01:00
dec
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
emma
MIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check
2011-11-08 12:35:29 +00:00
fw
…
include/asm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-03-05 21:16:26 -05:00
jazz
Merge branch 'next/generic' into mips-for-linux-next
2012-01-11 15:41:47 +01:00
jz4740
MIPS: Fix up inconsistency in panic() string argument.
2011-12-07 22:01:45 +00:00
kernel
MIPS: traps.c: Fix typo
2012-02-20 18:33:20 +01:00
lantiq
Merge branch 'next/generic' into mips-for-linux-next
2012-01-11 15:41:47 +01:00
lasat
MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD
2011-09-21 17:52:15 +02:00
lib
mips: use the the PCI controller's io_map_base
2012-01-31 23:20:30 +02:00
loongson
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
math-emu
MIPS Kprobes: Refactor branch emulation
2011-12-07 22:04:03 +00:00
mipssim
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
mm
MIPS: fault.c: Port OOM changes to do_page_fault
2012-02-20 18:33:19 +01:00
mti-malta
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
netlogic
MIPS: Netlogic: Mark Netlogic chips as SMT capable
2011-12-07 22:04:57 +00:00
oprofile
MIPS: oprofile: Add callgraph support
2011-06-15 14:35:34 +02:00
pci
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-03-05 21:16:26 -05:00
pmc-sierra
MIPS: PCI: use list_for_each_entry() for bus->devices traversal
2012-02-20 18:33:19 +01:00
pnx833x
…
pnx8550
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
power
MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kb
2011-05-10 18:15:26 +01:00
powertv
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
rb532
mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE
2011-10-31 19:30:57 -04:00
sgi-ip22
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
sgi-ip27
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
sgi-ip32
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
sibyte
MIPS: Sibyte: drop select of SIBYTE_CFE
2011-11-13 21:27:34 +01:00
sni
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
txx9
MIPS: txx9 7segled fix struct device has no member
2012-02-20 18:33:18 +01:00
vr41xx
mips: fix implicit smp.h usage in various files.
2011-10-31 19:30:55 -04:00
wrppmc
…
Kbuild
…
Kbuild.platforms
MIPS: XLR, XLS: Move makefile bits to were they belong.
2011-07-20 23:12:11 +01:00
Kconfig
mips: use the the PCI controller's io_map_base
2012-01-31 23:20:30 +02:00
Kconfig.debug
lib: consolidate DEBUG_STACK_USAGE option
2011-05-25 08:39:54 -07:00
Makefile
MIPS: BMIPS: Add CFLAGS, Makefile entries for BMIPS
2011-12-07 22:03:17 +00:00