Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bb5da4631ea483bcfa61585ab394d13c5550fa8e..90868f42e9558d1e1f35c8545ffd3090e59ec064 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1924,7 +1924,7 @@ S:        Maintained
 
 IDE/ATAPI CDROM DRIVER
 P:     Borislav Petkov
-M:     bbpetkov@yahoo.de
+M:     petkovbb@gmail.com
 L:     linux-ide@vger.kernel.org
 S:     Maintained