diff --git a/[refs] b/[refs] index 315ad33077ae..9c70271de991 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9de98fb4ec4c91597feedc521120c16fca54a5b6 +refs/heads/master: 2141355fcd4d2c95132226434d38f1c6ffff4105 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index ace8f9c81b96..e5059929e95c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1624,6 +1624,14 @@ T: git git://git.alsa-project.org/alsa-kernel.git S: Maintained F: sound/pci/oxygen/ +C6X ARCHITECTURE +M: Mark Salter +M: Aurelien Jacquiot +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 L: linux-cachefs@redhat.com