linux/arch/arm/mach-tegra
Arnd Bergmann 38abdcd0d0 Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2
Conflicts:
	arch/arm/mach-tegra/common.c
	arch/arm/mach-ux500/devices-common.c

This resolves two conflicts and lets us merge the exynos5 branch
cleanly.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-15 21:05:52 +00:00
..
2012-01-09 14:37:41 -08:00
2011-12-19 18:06:05 -08:00
2012-02-06 09:16:16 -08:00
2012-02-26 14:44:19 -08:00
2012-02-26 14:44:19 -08:00
2010-08-05 14:57:02 -07:00
2011-01-14 12:06:26 +00:00
2012-02-06 18:25:01 -08:00
2012-02-06 18:25:01 -08:00
2012-02-06 09:16:16 -08:00