From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Feb 2011 18:15:57 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6f576d57f1fa0d6026b495d8746d56d949989161;p=openwrt%2Fstaging%2Fblogic.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: HDA: Do not announce false surround in Conexant auto
  ALSA: HDA: Conexant auto: Handle multiple connections to ADC node
  ALSA: HDA: Add position_fix quirk for an Asus device
  ALSA: caiaq - Fix possible string-buffer overflow
  ALSA: au88x0 - Modify pointer callback to give accurate playback position
---

6f576d57f1fa0d6026b495d8746d56d949989161