Arnd Bergmann cf1fb2dfa7 Merge branch 'omap/headers4' into next/drivers ...

This avoids merge conflicts between the omap header changes and the gpmc
updates.

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

2012-11-15 17:18:30 +01:00

..

alpha

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

arm

Merge branch 'omap/headers4' into next/drivers

2012-11-15 17:18:30 +01:00

arm64

arm64: fix alignment padding in assembly code

2012-10-20 11:12:01 +01:00

avr32

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

blackfin

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

c6x

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

cris

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

frv

FRV: Fix const sections change

2012-10-16 18:49:15 -07:00

h8300

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

hexagon

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

ia64

UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from arches

2012-10-17 12:32:07 +01:00

m32r

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

m68k

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

microblaze

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

mips

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-10-18 11:49:39 -07:00

mn10300

UAPI: Make arch/mn10300/include/uapi/asm/setup.h non-empty

2012-10-17 12:32:35 +01:00

openrisc

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

parisc

UAPI: (Scripted) Disintegrate arch/parisc/include/asm

2012-10-16 21:28:05 +01:00

powerpc

cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.

2012-10-18 10:57:25 +11:00

s390

UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from arches

2012-10-17 12:32:07 +01:00

score

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

sh

UAPI: Make arch/sh/include/uapi/asm/hw_breakpoint.h non-empty

2012-10-17 12:32:35 +01:00

sparc

Merge tag 'uapi-fixes-20121017' of git://git.infradead.org/users/dhowells/linux-headers

2012-10-17 13:40:22 -07:00

tile

UAPI: The tile arch uses the generic ucontext.h file

2012-10-17 12:31:16 +01:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-10-13 10:05:52 +09:00

unicore32

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

x86

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-10-19 18:39:36 -07:00

xtensa

xtensa: add missing system calls to the syscall table

2012-10-19 10:46:44 -07:00

.gitignore

…

Kconfig

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00