]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:07 +0000 (15:02 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:07 +0000 (15:02 +0200)
commit62f5694343e6f6389d37e410178936186346ebbd
tree64047397c08f9fde3e5a81efa5f747be84043e63
parent221ef60a6d2c255e8f8cfea501c8ba64f3d4316a
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