tree 5730e211e047256bf00e332855ca82844bb66b05
parent 45b5bed7bc02a7f04127ac32f8fe7117b6baa419
parent 9dde3f92a7342e690f6f4a7ee8746d9b43d4c723
author Linus Torvalds <torvalds@linux-foundation.org> 1283030674 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1283030674 -0700

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: 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