commit 364e9e1887da25ce1bd682f4926f536e88b084ad
author Joe Perches <joe@perches.com> Mon Oct 26 16:49:45 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Oct 29 07:39:26 2009 -0700
tree 16af9245cf7f32eaf8a7bef681fec9411dc8f718
parent 2bf822d79f81c5923bce5630d2815857b5b98a6e

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>

MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cbea223..4d809ff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5742,8 +5742,7 @@
 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