tree 296a086ddb55bd47dc0ff9bea2623a43ed009bba
parent cb3f1e7b835f6fe0fc09574381fe54daf6600001
parent 6cb53e7ed77d429531afa8d822d59909f953a771
author Linus Torvalds <torvalds@g5.osdl.org> 1154880717 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1154880717 -0700

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