aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-10-26 16:49:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 07:39:26 -0700
commit364e9e1887da25ce1bd682f4926f536e88b084ad (patch)
tree16af9245cf7f32eaf8a7bef681fec9411dc8f718
parent2bf822d79f81c5923bce5630d2815857b5b98a6e (diff)
MAINTAINERS: WINBOND CIR - Integrate P:/M: lines, fixup David Härdeman's name
Signed-off-by: Joe Perches <joe@perches.com> Cc: David Härdeman <david@hardeman.nu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--MAINTAINERS3
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cbea223d6bb..4d809fff4b2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5742,8 +5742,7 @@ S: Maintained
F: drivers/scsi/wd7000.c
WINBOND CIR DRIVER
-P: David Härdeman
-M: david@hardeman.nu
+M: David Härdeman <david@hardeman.nu>
S: Maintained
F: drivers/input/misc/winbond-cir.c