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)
1  2 
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/include/mach/iomap.h

Simple merge