From a1ee53fd512e7bd27b7ff7bd73cf0067a03e58bc Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 29 Jul 2009 15:04:26 -0700 Subject: [PATCH] --- yaml --- r: 156067 b: refs/heads/master c: 9ae9a7f119a8def8e68d7f5ab0d96b3aba80accb h: refs/heads/master i: 156065: a1337f92ecd29990c597b5ea17ecff933b1ade00 156063: 5cee528c7d7e7d1678ecbd9d9e15573f509f0273 v: v3 --- [refs] | 2 +- trunk/CREDITS | 3 +++ trunk/MAINTAINERS | 9 --------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 2df30e9ab327..582f9479878d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bee73ff71e17f5a807376e29653998755211ceb +refs/heads/master: 9ae9a7f119a8def8e68d7f5ab0d96b3aba80accb diff --git a/trunk/CREDITS b/trunk/CREDITS index 44c13d19e7ea..1a41bf4addd0 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -3805,6 +3805,9 @@ S: van Bronckhorststraat 12 S: 2612 XV Delft S: The Netherlands +N: Thomas Woller +D: CS461x Cirrus Logic sound driver + N: David Woodhouse E: dwmw2@infradead.org D: JFFS2 file system, Memory Technology Device subsystem, diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6ef63194996a..1b02be36d960 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1508,15 +1508,6 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported F: sound/soc/codecs/cs4270* -CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER -P: Cirrus Logic Corporation (kernel 2.2 driver) -M: Cirrus Logic Corporation, Thomas Woller -P: Nils Faerber (port to kernel 2.4) -M: Nils Faerber -S: Maintained -F: Documentation/input/cs461x.txt -F: sound/pci/cs46xx/ - CLK API P: Russell King M: linux@arm.linux.org.uk