Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp
authorOlof Johansson <olof@lixom.net>
Sun, 26 Feb 2012 22:43:43 +0000 (14:43 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 26 Feb 2012 22:43:43 +0000 (14:43 -0800)
commit0f830e5c902106e7fe51460fd1e3263bea72bf41
treeb83090bb272fce3ebda9aac311f2185ce78be7a3
parent9335e9199bd059fc4f5e4e6fcfb9fca1d482e460
parentbdc93a77da75ee421125896ce4bbd91afff63809
Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp

Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/boot/dts/tegra-paz00.dts
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/tegra2_clocks.c