projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[platform/upstream/kernel-adaptation-pc.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
f817ae1
..
a26b10e
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-7818,7
+7818,7
@@
F: drivers/staging/asus_oled/
STAGING - COMEDI
M: Ian Abbott <abbotti@mev.co.uk>
-M:
Mori Hess <fmhess@users.sourceforge.net
>
+M:
H Hartley Sweeten <hsweeten@visionengravers.com
>
S: Odd Fixes
F: drivers/staging/comedi/