Merge tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cdb8fe8b6182f25cf509cefa5817be0156b6d188..1a3963a3a3306a2dfe6a309955946e0c8bfae2f3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7299,8 +7299,7 @@ S:        Odd Fixes
 F:     drivers/staging/olpc_dcon/
 
 STAGING - OZMO DEVICES USB OVER WIFI DRIVER
-M:     Rupesh Gujare <rgujare@ozmodevices.com>
-M:     Chris Kelly <ckelly@ozmodevices.com>
+M:     Rupesh Gujare <rupesh.gujare@atmel.com>
 S:     Maintained
 F:     drivers/staging/ozwpan/