Merge tag 'for-linux-3.3-merge-window' of git://linux-c6x.org/git/projects/linux...

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0460f6550e4b328e5a127e75d6bf33f829bc35b0..311b0c4055721888b7415d8ce1cef1eb7280a3a5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1645,6 +1645,14 @@ T:       git git://git.alsa-project.org/alsa-kernel.git
 S:     Maintained
 F:     sound/pci/oxygen/
 
+C6X ARCHITECTURE
+M:     Mark Salter <msalter@redhat.com>
+M:     Aurelien Jacquiot <a-jacquiot@ti.com>
+L:     linux-c6x-dev@linux-c6x.org
+W:     http://www.linux-c6x.org/wiki/index.php/Main_Page
+S:     Maintained
+F:     arch/c6x/
+
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:     David Howells <dhowells@redhat.com>
 L:     linux-cachefs@redhat.com