]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:49:33 +0000 (11:49 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:49:33 +0000 (11:49 +0200)
commita3b0272e257f801864107a55f79a13eb7093660c
treeb35a5719c8fa3060a1c4e35a3b20004d29a74f0e
parent6ed6de455fc992a489377d5c587cf00565ea3241
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