diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 12:11:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 12:11:57 -0400 |
commit | a05ef8bfdc03c5061f44d91826caa855b0aae481 (patch) | |
tree | 296a086ddb55bd47dc0ff9bea2623a43ed009bba /MAINTAINERS | |
parent | cb3f1e7b835f6fe0fc09574381fe54daf6600001 (diff) | |
parent | 6cb53e7ed77d429531afa8d822d59909f953a771 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] Don't reject O_RDWR at opening PCM OSS with read/write-only device
[ALSA] snd-emu10k1: Implement support for Audigy 2 ZS [SB0353]
[ALSA] add MAINTAINERS entry for snd-aoa
[ALSA] aoa: platform function gpio: ignore errors from functions that don't exist
[ALSA] make snd-powermac load even when it can't bind the device
[ALSA] aoa: fix toonie codec
[ALSA] aoa: feature gpio layer: fix IRQ access
[ALSA] Conversions from kmalloc+memset to k(z|c)alloc
[ALSA] snd-emu10k1: Fixes ALSA bug#2190
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bd82e99a8c21..e3e1515ba5a9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -298,6 +298,13 @@ L: info-linux@geode.amd.com | |||
298 | W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html | 298 | W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html |
299 | S: Supported | 299 | S: Supported |
300 | 300 | ||
301 | AOA (Apple Onboard Audio) ALSA DRIVER | ||
302 | P: Johannes Berg | ||
303 | M: johannes@sipsolutions.net | ||
304 | L: linuxppc-dev@ozlabs.org | ||
305 | L: alsa-devel@alsa-project.org | ||
306 | S: Maintained | ||
307 | |||
301 | APM DRIVER | 308 | APM DRIVER |
302 | P: Stephen Rothwell | 309 | P: Stephen Rothwell |
303 | M: sfr@canb.auug.org.au | 310 | M: sfr@canb.auug.org.au |