Merge branch 'tegra/soc' into next/cleanup2

Conflicts:
	arch/arm/mach-tegra/Makefile

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2012-03-27 17:19:15 -07:00
commit b521d929b3
14 changed files with 3456 additions and 13 deletions