Merge branch 'fadt-test' into test

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8dae4555f10e1b91f0c2eafb84f04fbf71812e55..4b7d8f291cd4a043dff37ec9fd66b45269fcfc9f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1415,8 +1415,8 @@ M:        rdunlap@xenotime.net
 S:     Maintained
 
 DOCKING STATION DRIVER
-P:     Kristen Carlson Accardi
-M:     kristen.c.accardi@intel.com
+P:     Shaohua Li
+M:     shaohua.li@intel.com
 L:     linux-acpi@vger.kernel.org
 S:     Supported