Merge commit 'jwb/next' into next

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cf4db76f8b29eed464618c37e4b97ec39ba9fddf..13608bd2e7913941bae445f08c201912f798c2fd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2887,6 +2887,13 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
 S:     Maintained
 F:     drivers/input/
 
+INTEL IDLE DRIVER
+M:     Len Brown <[email protected]>
+L:     [email protected]
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
+S:     Supported
+F:     drivers/idle/intel_idle.c
+
 INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 M:     Maik Broemme <[email protected]>
 L:     [email protected]
@@ -5007,6 +5014,12 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/mmc/host/sdhci-s3c.c
 
+SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
+M:     Viresh Kumar <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/mmc/host/sdhci-spear.c
+
 SECURITY SUBSYSTEM
 M:     James Morris <[email protected]>
 L:     [email protected] (suggested Cc:)