]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 05:02:22 +0000 (16:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 05:02:22 +0000 (16:02 +1100)
commit2962e927d3ae4559aa22fd4c94fd5c492bf3a29f
treea4ea5a0a51e4bc0e7cb31c030902b72f1834b98c
parent9ee34730820654fa586efd930e11dec92092559d
parent250266f0b31d9b92e66092fcc6045cb93b04b118
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
drivers/clocksource/tegra20_timer.c
arch/arm/Kconfig
arch/arm/boot/dts/tegra20.dtsi
arch/arm/boot/dts/tegra30.dtsi
arch/arm/mach-tegra/board-harmony-pcie.c
drivers/clk/tegra/clk-tegra20.c
drivers/clocksource/tegra20_timer.c