kevin/linux
1
Fork 0
Code
7d1206bc28
linux/arch/mips
History
Arnd Bergmann a94c7b0a8f Merge branch 'spear/dt' into next/dt2 
* spear/dt:
  ARM: SPEAr600: Add device-tree support to SPEAr600 boards

(update to v3.3-rc7)

Conflicts:
	arch/arm/mach-spear6xx/spear6xx.c
	arch/arm/mach-vexpress/Kconfig

The conflicts are between the previous contents of the next/dt2
branch and upstream changes from v3.3-rc7.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-16 20:25:17 +00: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
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 branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00: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 Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
lantiq Merge branch 'next/generic' into mips-for-linux-next 2012-01-11 15:41:47 +01:00
lasat
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
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
pci MIPS: PCI: use list_for_each_entry() for bus->devices traversal 2012-02-20 18:33:19 +01: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
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
Kconfig irq_domain/mips: Allow irq_domain on MIPS 2012-02-24 09:47:23 -07:00
Kconfig.debug
Makefile MIPS: BMIPS: Add CFLAGS, Makefile entries for BMIPS 2011-12-07 22:03:17 +00:00