]> 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, 19 Sep 2012 05:02:55 +0000 (15:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 05:02:55 +0000 (15:02 +1000)
commitecaf1894361bdad46054e05eb0f11cf17a9f4f01
treec194c0241bffd80e259ee7b3aa256e1318b43c24
parentc7b53a3dd132a412753be1ea250ee46c8fd8bc01
parent67b68bf40ca6f973086bb1c5c0dccd357ad7cb15
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
arch/arm/mach-tegra/devices.c
arch/arm/configs/tegra_defconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/tegra20_clocks.c
arch/arm/mach-tegra/tegra20_clocks_data.c
drivers/spi/Kconfig
drivers/spi/spi-tegra.c