Arnd Bergmann 526b264163 Merge branch 'imx/cleanup' into imx/devel ...

This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.

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

2011-10-07 21:57:31 +02:00

..

alpha

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

arm

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

avr32

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

blackfin

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

cris

cris: add missing declaration of kgdb_init() and breakpoint()

2011-08-03 14:25:22 -10:00

frv

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

h8300

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

ia64

[IA64] fix "allnoconfig" build

2011-08-09 12:36:00 -07:00

m32r

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

m68k

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

microblaze

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

2011-07-27 09:24:20 -07:00

mips

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

mn10300

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

openrisc

OpenRISC: Miscellaneous

2011-07-22 18:46:41 +02:00

parisc

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

2011-08-04 06:36:20 -10:00

powerpc

powerpc: Really fix build without CONFIG_PCI

2011-08-11 01:15:44 +10:00

s390

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

2011-08-04 06:35:51 -10:00

score

modules: make arch's use default loader hooks

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

sh

cpuidle: Consistent spelling of cpuidle_idle_call()

2011-08-04 16:35:34 -10:00

sparc

sparc: fix array bounds error setting up PCIC NMI trap

2011-08-18 21:47:40 -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

ptrace: unify show_regs() prototype

2011-07-26 16:49:43 -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://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2011-08-22 11:25:44 -07:00

xtensa

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

.gitignore

…

Kconfig

Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG

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