Merge remote-tracking branch 'tegra/for-next'

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/tegra20-seaboard.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-trimslice.dts
Simple merge

diff --cc arch/arm/mach-tegra/Kconfig
Simple merge

diff --cc arch/arm/mach-tegra/platsmp.c
Simple merge

diff --cc arch/arm/mach-tegra/pm.c
Simple merge