Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2b38266d592acd66e71db39e19a4ed4437dd4e7c..2e5bbc0d68b26e188e2d7e8154cf80e47fabdda1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3278,12 +3278,6 @@ F:       drivers/firmware/dmi-id.c
 F:     drivers/firmware/dmi_scan.c
 F:     include/linux/dmi.h
 
-DOCKING STATION DRIVER
-M:     Shaohua Li <shaohua.li@intel.com>
-L:     linux-acpi@vger.kernel.org
-S:     Supported
-F:     drivers/acpi/dock.c
-
 DOCUMENTATION
 M:     Jonathan Corbet <corbet@lwn.net>
 L:     linux-doc@vger.kernel.org