staging: octeon-usb: cvmx-usbcx-defs.h: delete unused macros

[linux-imx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b645a3d5fd30c2baf3af95e745116c1b8aaaa6a5..5ebb4ce734ff0ab983dd423cd69560ffdb0f8094 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6084,6 +6084,7 @@ L:        linux-parisc@vger.kernel.org
 W:     http://www.parisc-linux.org/
 Q:     http://patchwork.kernel.org/project/linux-parisc/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
 S:     Maintained
 F:     arch/parisc/
 F:     drivers/parisc/
@@ -7763,7 +7764,7 @@ F:        drivers/staging/media/solo6x10/
 STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 M:     William Hubbs <w.d.hubbs@gmail.com>
 M:     Chris Brannon <chris@the-brannons.com>
-M:     Kirk Reiser <kirk@braille.uwo.ca>
+M:     Kirk Reiser <kirk@reisers.ca>
 M:     Samuel Thibault <samuel.thibault@ens-lyon.org>
 L:     speakup@braille.uwo.ca
 W:     http://www.linux-speakup.org/