Merge commit 'v2.6.36' into kbuild/misc

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f2a2b8e..67acab6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1615,7 +1615,7 @@ F:        drivers/platform/x86/classmate-laptop.c
 COCCINELLE/Semantic Patches (SmPL)
 M:     Julia Lawall <julia@diku.dk>
 M:     Gilles Muller <Gilles.Muller@lip6.fr>
-M:     Nicolas Palix <npalix@diku.dk>
+M:     Nicolas Palix <npalix.work@gmail.com>
 L:     cocci@diku.dk (moderated for non-subscribers)
 W:     http://coccinelle.lip6.fr/
 S:     Supported