Merge branch 'tegra/cleanup' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 14:31:43 +0000 (16:31 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 14:31:43 +0000 (16:31 +0200)
commit3be1812ea3b7193ee1a3993cadf9a7985121cf16
tree4aed605da38588bae8544dccdf6f81004d02ee0b
parent759417ac74fedf74af9c1c1510a9e4e15b951239
parent6affb4826405dc1f53bae0e5c302a18f734a44ca
Merge branch 'tegra/cleanup' into next/soc

This is a dependency for the tegra/soc branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/tegra20.dtsi
arch/arm/boot/dts/tegra30.dtsi
drivers/clk/tegra/clk-tegra20.c