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
blackfin
c6x
cris
frv	frv: fix the broken preempt	2012-11-02 12:08:25 -04:00
h8300
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
m68k	m68k: Wire up kcmp	2012-10-19 17:49:37 +02:00
microblaze
mips	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-10-18 11:49:39 -07:00
mn10300
openrisc
parisc
powerpc
s390	s390,uapi: do not use uapi/asm-generic/kvm_para.h	2012-10-19 11:07:18 +02:00
score
sh
sparc
tile	arch/tile: avoid build warnings from duplicate ELF_R_xxx #defines	2012-10-23 10:22:48 -04:00
um
unicore32
x86	Bug-fixes:	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