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)
Conflicts:
arch/arm/mach-tegra/Makefile


Trivial merge