Merge remote branch 'remotes/korg_olof_tegra/for-3.4/soc' into for-3.4/fixes-for...
authorStephen Warren <swarren@wwwdotorg.org>
Mon, 26 Mar 2012 15:49:22 +0000 (09:49 -0600)
committerStephen Warren <swarren@wwwdotorg.org>
Mon, 26 Mar 2012 15:49:22 +0000 (09:49 -0600)
commit1ad105fc77e61f9dd7a272659a248e2979fdb893
treeb8f0c64314e05c9208501d9aba89cc5abb57234e
parent2bc856c419d9941589ff210900a60906d773f1c4
parente186ad74c0941f5caeda28bde76dab903b342c1c
Merge remote branch 'remotes/korg_olof_tegra/for-3.4/soc' into for-3.4/fixes-for-io-cleanup
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/include/mach/iomap.h