summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 18:19:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 18:19:55 -0700
commit28a78e46f04ac5c4952533f2938a18699f207004 (patch)
tree2991c5cea8d7f912abbe59e315fd1ed03febe45c /MAINTAINERS
parent84a1caf1453c3d44050bd22db958af4a7f99315c (diff)
parentb0d1f807f340e91b27aa721f6474956af11571da (diff)
downloadlinux-stable-28a78e46f04ac5c4952533f2938a18699f207004.tar.gz
linux-stable-28a78e46f04ac5c4952533f2938a18699f207004.tar.bz2
linux-stable-28a78e46f04ac5c4952533f2938a18699f207004.zip
Merge 3.5-rc7 into driver-core-next
This pulls in the printk fixes to the driver-core-next branch. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1b71f6ceae0a..63ccf7edec3d 100644
--- 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