]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.8/single-zimage' into for-next
authorStephen Warren <swarren@nvidia.com>
Wed, 14 Nov 2012 20:31:06 +0000 (13:31 -0700)
committerStephen Warren <swarren@nvidia.com>
Wed, 14 Nov 2012 20:31:06 +0000 (13:31 -0700)
1  2 
arch/arm/boot/dts/tegra20.dtsi
arch/arm/boot/dts/tegra30.dtsi
arch/arm/mach-tegra/common.c

Simple merge
Simple merge
Simple merge