staging: comedi: vmk80xx: rename vmk80xx_attach_common()

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3105c48..1f91703 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6585,7 +6585,7 @@ F:        drivers/media/platform/s3c-camif/
 F:     include/media/s3c_camif.h
 
 SERIAL DRIVERS
-M:     Alan Cox <alan@linux.intel.com>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial
@@ -7303,8 +7303,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/