The following commit has been merged in the linux branch: commit 364e9e1887da25ce1bd682f4926f536e88b084ad Author: Joe Perches joe@perches.com Date: Mon Oct 26 16:49:45 2009 -0700

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

diff --git a/MAINTAINERS b/MAINTAINERS index cbea223..4d809ff 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