Merge v3.5-rc5 into driver-core-next

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index eb22272b2116c70cb6a6af438c24ab9f2edad9fb..59df5746c6222ac60393dd609deede4549c3ac7f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2709,6 +2709,14 @@ M:       Mimi Zohar <zohar@us.ibm.com>
 S:     Supported
 F:     security/integrity/evm/
 
+EXTERNAL CONNECTOR SUBSYSTEM (EXTCON)
+M:     MyungJoo Ham <myungjoo.ham@samsung.com>
+M:     Chanwoo Choi <cw00.choi@samsung.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/extcon/
+F:     Documentation/extcon/
+
 EXYNOS DP DRIVER
 M:     Jingoo Han <jg1.han@samsung.com>
 L:     linux-fbdev@vger.kernel.org