Merge tag 'tegra-for-3.7-maintainers' of git://git.kernel.org/pub/scm/linux/kernel...

* tag 'tegra-for-3.7-maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  MAINTAINERS: tegra: remove Olof/Colin, add device tree files
  MAINTAINERS: add defconfig file to TEGRA section
  + sync with 3.6-rc4

diff --git a/MAINTAINERS b/MAINTAINERS
index 7c9fdb0..95e66a4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -913,6 +913,12 @@ W: http://www.digriz.org.uk/ts78xx/kernel
 S:     Maintained
 F:     arch/arm/mach-orion5x/ts78xx-*
 
+ARM/MICREL KS8695 ARCHITECTURE
+M:     Greg Ungerer <gerg@uclinux.org>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+F:     arch/arm/mach-ks8695
+S:     Odd Fixes
+
 ARM/MIOA701 MACHINE SUPPORT
 M:     Robert Jarzmik <robert.jarzmik@free.fr>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)