diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-31 13:19:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-31 13:19:51 +1000 |
| commit | d917dab0764ae9f97bf5799a179283a7c22574d0 (patch) | |
| tree | f6bc84b29775d0433e91585899a779d481774610 /MAINTAINERS | |
| parent | 3d4a37503f2b2bd622a67f995d6672a1234d4e63 (diff) | |
| parent | 423e118c0be32274de137a4d97f0dcac3edd136a (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/silicom/bpctl_mod.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f3b7d1e893d6..bdb527a177a8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7783,7 +7783,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/ |