Merge 4.5-rc6 into usb-next
[linux-2.6-microblaze.git] / MAINTAINERS
index da3e4d8..a1477a7 100644 (file)
@@ -11256,7 +11256,7 @@ F:      include/linux/mtd/ubi.h
 F:     include/uapi/mtd/ubi-user.h
 
 USB ACM DRIVER
-M:     Oliver Neukum <oliver@neukum.org>
+M:     Oliver Neukum <oneukum@suse.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     Documentation/usb/acm.txt