Arnd Bergmann c72dbae971 Merge branch 'imx/devel' into next/dt ...

The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.

Conflicts:
	arch/arm/mach-mx5/board-mx53_loco.c
	arch/arm/mach-mx5/board-mx53_smd.c
	arch/arm/plat-mxc/include/mach/common.h
	arch/arm/plat-mxc/include/mach/memory.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2011-11-01 17:12:22 +01:00

..

alpha

alpha, gpio: GENERIC_GPIO default must be n

2011-09-14 18:09:37 -07:00

arm

Merge branch 'imx/devel' into next/dt

2011-11-01 17:12:22 +01:00

avr32

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

blackfin

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

cris

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

frv

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

h8300

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

ia64

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

m32r

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

m68k

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

microblaze

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

mips

MIPS: Call oops_enter, oops_exit in die

2011-10-01 20:36:04 +01:00

mn10300

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

openrisc

Add missing DMA ops

2011-09-11 09:50:39 +02:00

parisc

remove remaining references to nfsservctl

2011-08-29 16:31:59 -07:00

powerpc

powerpc: Fix device-tree matching for Apple U4 bridge

2011-09-29 19:22:40 -07:00

s390

[S390] gmap: always up mmap_sem properly

2011-09-26 16:40:50 +02:00

score

modules: make arch's use default loader hooks

2011-07-24 22:06:04 +09:30

sh

Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x

2011-08-29 13:34:48 -07:00

sparc

sparc: Add alignment flag to PCI expansion resources

2011-10-19 16:20:50 -07:00

tile

tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files

2011-10-13 08:25:01 -04:00

um

um: fix strrchr() problems

2011-09-14 18:09:37 -07:00

unicore32

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2011-07-29 23:35:05 -07:00

x86

x86: Fix S4 regression

2011-10-24 06:55:20 +02:00

xtensa

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

.gitignore

…

Kconfig

Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG

2011-08-03 11:12:37 -04:00