Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f6ff81..e39e9da 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1958,10 +1958,10 @@ S:      Supported
 F:     drivers/platform/x86/classmate-laptop.c
 
 COCCINELLE/Semantic Patches (SmPL)
-M:     Julia Lawall <julia@diku.dk>
+M:     Julia Lawall <Julia.Lawall@lip6.fr>
 M:     Gilles Muller <Gilles.Muller@lip6.fr>
-M:     Nicolas Palix <npalix.work@gmail.com>
-L:     cocci@diku.dk (moderated for non-subscribers)
+M:     Nicolas Palix <nicolas.palix@imag.fr>
+L:     cocci@systeme.lip6.fr (moderated for non-subscribers)
 W:     http://coccinelle.lip6.fr/
 S:     Supported
 F:     scripts/coccinelle/
@@ -2423,11 +2423,6 @@ S:       Maintained
 F:     Documentation/hwmon/dme1737
 F:     drivers/hwmon/dme1737.c
 
-DOCBOOK FOR DOCUMENTATION
-M:     Randy Dunlap <rdunlap@xenotime.net>
-S:     Maintained
-F:     scripts/kernel-doc
-
 DOCKING STATION DRIVER
 M:     Shaohua Li <shaohua.li@intel.com>
 L:     linux-acpi@vger.kernel.org
@@ -4377,7 +4372,7 @@ F:        Documentation/scsi/53c700.txt
 F:     drivers/scsi/53c700*
 
 LED SUBSYSTEM
-M:     Bryan Wu <bryan.wu@canonical.com>
+M:     Bryan Wu <cooloney@gmail.com>
 M:     Richard Purdie <rpurdie@rpsys.net>
 L:     linux-leds@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git