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
..
clkdev.h	ARM: Add Versatile Express support	2010-05-02 09:35:38 +01:00
ct-ca9x4.h	Merge branch 'tegra/cleanups' into next/timer	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
gpio.h	gpio: Fix ARM versatile-express build failure	2011-10-29 12:50:45 +02:00
hardware.h	ARM: Add Versatile Express support	2010-05-02 09:35:38 +01:00
io.h	ARM: io: remove IO_SPACE_LIMIT from platforms without PCI/ISA	2011-08-17 08:44:17 +01:00
irqs.h	ARM: Add Versatile Express support	2010-05-02 09:35:38 +01:00
motherboard.h	ARM: vexpress: Get rid of MMIO_P2V	2012-02-23 15:09:42 +00:00
timex.h	ARM: Add Versatile Express support	2010-05-02 09:35:38 +01:00
uncompress.h	ARM: Add Versatile Express support	2010-05-02 09:35:38 +01:00