Linus Walleij db6364a650 ARM: nomadik: fixup some FSMC merge problems ...

Due to a clash between refactoring and due to loss of a header
file that remained in my working tree the Nomadik stopped
compiling after switching to the FSMC driver. This patch fixes
it up.

Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

2012-11-15 15:37:47 +02:00

..

alpha

alpha: separate thread-synchronous flags

2012-10-24 05:16:45 +03:00

arm

ARM: nomadik: fixup some FSMC merge problems

2012-11-15 15:37:47 +02: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 the broken preempt

2012-11-02 12:08:25 -04: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: Make arch/ia64/include/asm/kvm_para.h generic

2012-10-18 17:27:43 -07: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

m68k: Wire up kcmp

2012-10-19 17:49:37 +02: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

s390,uapi: do not use uapi/asm-generic/kvm_para.h

2012-10-19 11:07:18 +02: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

arch/tile: avoid build warnings from duplicate ELF_R_xxx #defines

2012-10-23 10:22:48 -04: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 tag 'stable/for-linus-3.7-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2012-11-02 13:26:11 -07:00

xtensa

xtensa: switch to generic sys_execve()

2012-10-25 15:00: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