Merge tag 'omap-for-v3.13/dt-fixes-for-merge-window' of git://git.kernel.org/pub...

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a0cbf3cf2c8c01c5be662eef372eff4060daffc..cb1f2e022aa14bbc4f176230fa46b522f3b28a5a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -929,7 +929,7 @@ M:  Javier Martinez Canillas <javier@dowhile0.org>
 L:     linux-omap@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/mach-omap2/board-igep0020.c
+F:     arch/arm/boot/dts/omap3-igep*
 
 ARM/INCOME PXA270 SUPPORT
 M:     Marek Vasut <marek.vasut@gmail.com>
@@ -6088,6 +6088,12 @@ L:       linux-omap@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-omap.c
 
+OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
+M:     Mark Jackson <mpfj@newflow.co.uk>
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     arch/arm/boot/dts/am335x-nano.dts
+
 OMFS FILESYSTEM
 M:     Bob Copeland <me@bobcopeland.com>
 L:     linux-karma-devel@lists.sourceforge.net