aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS3
-rw-r--r--MAINTAINERS9
2 files changed, 3 insertions, 9 deletions
diff --git a/CREDITS b/CREDITS
index 44c13d19e7ea..1a41bf4addd0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3805,6 +3805,9 @@ S: van Bronckhorststraat 12
3805S: 2612 XV Delft 3805S: 2612 XV Delft
3806S: The Netherlands 3806S: The Netherlands
3807 3807
3808N: Thomas Woller
3809D: CS461x Cirrus Logic sound driver
3810
3808N: David Woodhouse 3811N: David Woodhouse
3809E: dwmw2@infradead.org 3812E: dwmw2@infradead.org
3810D: JFFS2 file system, Memory Technology Device subsystem, 3813D: JFFS2 file system, Memory Technology Device subsystem,
diff --git a/MAINTAINERS b/MAINTAINERS
index 6ef63194996a..1b02be36d960 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1508,15 +1508,6 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1508S: Supported 1508S: Supported
1509F: sound/soc/codecs/cs4270* 1509F: sound/soc/codecs/cs4270*
1510 1510
1511CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
1512P: Cirrus Logic Corporation (kernel 2.2 driver)
1513M: Cirrus Logic Corporation, Thomas Woller <twoller@crystal.cirrus.com>
1514P: Nils Faerber (port to kernel 2.4)
1515M: Nils Faerber <nils@kernelconcepts.de>
1516S: Maintained
1517F: Documentation/input/cs461x.txt
1518F: sound/pci/cs46xx/
1519
1520CLK API 1511CLK API
1521P: Russell King 1512P: Russell King
1522M: linux@arm.linux.org.uk 1513M: linux@arm.linux.org.uk