summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-24 01:17:31 -0500
committerLen Brown <len.brown@intel.com>2009-12-24 01:17:31 -0500
commit6d3bf6818a1d5527f44681d3f763051dfb1930e4 (patch)
tree7b1fa430de292232af7a1af218fd61f94095cee6 /MAINTAINERS
parentda3df858c88f7bb420f2517ee9aab238da2e6ed7 (diff)
parent529aa8cb0a59367d08883f818e8c47028e819d0d (diff)
downloadlinux-3.10-6d3bf6818a1d5527f44681d3f763051dfb1930e4.tar.gz
linux-3.10-6d3bf6818a1d5527f44681d3f763051dfb1930e4.tar.bz2
linux-3.10-6d3bf6818a1d5527f44681d3f763051dfb1930e4.zip
Merge branch 'classmate' into release
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 745643b8c34..cf3f412dd6f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1472,6 +1472,12 @@ L: linux-scsi@vger.kernel.org
S: Supported
F: drivers/scsi/fnic/
+CMPC ACPI DRIVER
+M: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
+M: Daniel Oliveira Nascimento <don@syst.com.br>
+S: Supported
+F: drivers/platform/x86/classmate-laptop.c
+
CODA FILE SYSTEM
M: Jan Harkes <jaharkes@cs.cmu.edu>
M: coda@cs.cmu.edu