aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 19:38:36 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 19:38:36 -0500
commit4da5cc2cec8caec1d357053e85a7a32f243f93a1 (patch)
tree3f8b603af4af88f86be7ec1d4e3639a7fc9dd1a6 /MAINTAINERS
parent25c862cc9ea9b312c25a9f577f91b973131f1261 (diff)
parentc6f43290ae687c11cdcd150d8bfeb57ec29cfa5b (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b524ca363081..1e59d3966012 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -650,6 +650,11 @@ L: linux-crypto@vger.kernel.org
650T: git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git 650T: git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
651S: Maintained 651S: Maintained
652 652
653CS5535 Audio ALSA driver
654P: Jaya Kumar
655M: jayakumar.alsa@gmail.com
656S: Maintained
657
653CYBERPRO FB DRIVER 658CYBERPRO FB DRIVER
654P: Russell King 659P: Russell King
655M: rmk@arm.linux.org.uk 660M: rmk@arm.linux.org.uk