From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 6 Aug 2006 16:11:57 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
X-Git-Tag: v3.12-rc1~34055^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a05ef8bfdc03c5061f44d91826caa855b0aae481;p=kernel%2Fkernel-generic.git

Merge /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
---

a05ef8bfdc03c5061f44d91826caa855b0aae481