From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Aug 2010 21:24:34 +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.36-rc3~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b3a7c0f8a030561cb4eb5e905149938575e8085;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.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: pcm: add more format names
  sound: oss: fix uninitialized spinlock
  ALSA: asihpi - Return hw error directly from oustream_write.
  ASoC: soc-core: fix debugfs_pop_time file permissions
  ALSA: hda - Add Sony VAIO quirk for ALC269
---

6b3a7c0f8a030561cb4eb5e905149938575e8085