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
..
include/mach	Merge branch 'tegra/cleanups' into next/timer	2012-03-21 14:27:34 +00:00
board-nhk8815.c	Merge branch 'tegra/cleanups' into next/timer	2012-03-21 14:27:34 +00:00
clock.c	ARM: 6483/1: arm & sh: factorised duplicated clkdev.c	2010-11-26 10:51:04 +00:00
clock.h	ARM: 6145/1: ux500 MTU clockrate correction	2010-05-27 10:36:08 +01:00
cpu-8815.c	ARM: amba: nomadik: use common amba device initializers	2012-01-26 19:59:29 +00:00
cpu-8815.h	ARM: restart: nomadik: use new restart hook	2012-01-05 12:57:16 +00:00
i2c-8815nhk.c	ARM: 7032/1: plat-nomadik: break out GPIO driver specifics	2011-08-22 09:12:53 +01:00
Kconfig	gpio: move Nomadik GPIO driver to drivers/gpio	2011-05-26 17:30:03 -06:00
Makefile	ARM: 5969/1: nomadik: move gpio to plat-nomadik	2010-03-19 18:29:31 +00:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00