From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Oct 2008 17:42:55 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: v2.6.28-rc1~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eb81071584bed0b04adcaf57e525638d0f92e1e1;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: aoa i2sbus: don't overwrite module parameter
  ALSA: ASoC: tlv320aic3x: Fix DSP DAI format and signal polarities matching
  ALSA: ASoC: OMAP: Continue fixing DSP DAI format in McBSP DAI driver
  ALSA: Ensure PXA runtime data is initialised
  ALSA: hda - correct bracketing in spdif test in patch_sigmatel.c
  ALSA: hda - Fix conflicting volume controls on ALC260
---

eb81071584bed0b04adcaf57e525638d0f92e1e1