]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 03:42:20 +0000 (14:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 03:42:20 +0000 (14:42 +1100)
commit86d092fa8768b6fc71db1c647a1d48042c2cffcf
tree0b411b8fff1e4270646f17298e32d25d4936a6ff
parentdb05cbaa56f27d02ea8f07c32642dc9ac72e11f3
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