Arnd Bergmann eed1e57650 Merge branch 'stericsson/cleanup' into next/timer ...

The timer and cleanup branches from stericsson conflict,
so I'm merging them here.

Conflicts:
	arch/arm/mach-ux500/Makefile
	arch/arm/mach-ux500/cpu.c

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

2011-10-31 23:42:23 +01:00

..

alpha

alpha, gpio: GENERIC_GPIO default must be n

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

arm

Merge branch 'stericsson/cleanup' into next/timer

2011-10-31 23:42:23 +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

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07: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

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2011-08-31 08:58:36 -07:00

s390

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07: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

sparc64: Only Panther cheetah+ chips have POPC.

2011-08-29 21:14:29 -07:00

tile

Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2011-08-03 21:53:27 -10: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

Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen

2011-09-16 11:28:11 -07: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