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

diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
Simple merge

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

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

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

diff --cc arch/arm/mach-tegra/devices.h
Simple merge

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