]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:53:53 +0000 (13:53 +0200)
committerThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:53:53 +0000 (13:53 +0200)
commit843bce825a7ffbdde17c7546e55e2b671f8095b8
treeb35f66d9afde2d2bf5aad4006d230d536acfa169
parent4a538f4d7f3a80f55a7cddba9ae15d1470d2110e
parent1ebd0d6a0589138d378d536e1b641a78622b158e
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
MAINTAINERS
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/tegra.c