diff --git a/[refs] b/[refs]
index 462faf703d73..d4aa1912ae7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8edca3fe9efb43ba41e22f182546e874227b92cb
+refs/heads/master: c4048c641ad7769e4197ff114eaab01f4662cbca
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 49afc491dc13..3603fd3be6c7 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -7248,7 +7248,7 @@ S:	Odd Fixes
 F:	drivers/staging/olpc_dcon/
 
 STAGING - OZMO DEVICES USB OVER WIFI DRIVER
-M:	Rupesh Gujare <rgujare@ozmodevices.com>
+M:	Rupesh Gujare <rupesh.gujare@atmel.com>
 S:	Maintained
 F:	drivers/staging/ozwpan/
 
diff --git a/trunk/drivers/staging/ozwpan/TODO b/trunk/drivers/staging/ozwpan/TODO
index c71bd83d0d7c..b4febd79a68d 100644
--- a/trunk/drivers/staging/ozwpan/TODO
+++ b/trunk/drivers/staging/ozwpan/TODO
@@ -10,5 +10,5 @@ TODO:
 	- testing with as many devices as possible.
 
 Please send any patches for this driver to
-Rupesh Gujare <rgujare@ozmodevices.com>
+Rupesh Gujare <rupesh.gujare@atmel.com>
 and Greg Kroah-Hartman <gregkh@linuxfoundation.org>.