Arnd Bergmann 2cbe23e3a4 Merge branch 'tegra/cleanups' into next/timer ... Conflicts: arch/arm/mach-tegra/Makefile arch/arm/mach-vexpress/core.h The tegra Makefile was changed in four different branches in the same line. This merge should reduce the amount of churn. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-21 14:27:34 +00:00
..
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
fsmc.h	mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board)	2009-09-20 05:59:42 -07:00
gpio.h	ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>	2011-08-23 15:30:04 +01:00
hardware.h	[ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board	2009-07-02 21:20:44 +01:00
io.h	[ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board	2009-07-02 21:20:44 +01:00
irqs.h	[ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board	2009-07-02 21:20:44 +01:00
nand.h	mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board)	2009-09-20 05:59:42 -07:00
timex.h	[ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board	2009-07-02 21:20:44 +01:00
uncompress.h	[ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board	2009-07-02 21:20:44 +01:00