]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 06:29:11 +0000 (16:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 06:29:11 +0000 (16:29 +1000)
commit00cf44818fd50975af790c08a0d85ddc158e1c6b
tree3b8d350d88966253ccdfeae4b9a7a4894a043cc9
parentbfaca9eb41d5371c9fa176a9be44f509359cd030
parentec6f121ddd048628afcc6bb0e3612eefb223930e
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
arch/arm/mach-tegra/devices.c
MAINTAINERS
arch/arm/Kconfig
drivers/mmc/host/sdhci-tegra.c