]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'tegra/soc' into next/cleanup2
authorOlof Johansson <olof@lixom.net>
Wed, 28 Mar 2012 00:19:15 +0000 (17:19 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 28 Mar 2012 00:19:15 +0000 (17:19 -0700)
commitb521d929b330d665cb3a42b26eaaa5690dc9dad7
tree7c1ddf1c06922c4728b6625fb10cf11de5a29387
parent83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4
parentd405e4b07a15b9d24d504a459295cf00a618c10c
Merge branch 'tegra/soc' into next/cleanup2

Conflicts:
arch/arm/mach-tegra/Makefile

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/include/mach/iomap.h