]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
Conflicts:
MAINTAINERS

1  2 
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/tegra.c

Simple merge
Simple merge
Simple merge