| commit | 6b3a7c0f8a030561cb4eb5e905149938575e8085 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 28 14:24:34 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 28 14:24:34 2010 -0700 |
| tree | 5730e211e047256bf00e332855ca82844bb66b05 | |
| parent | 45b5bed7bc02a7f04127ac32f8fe7117b6baa419 [diff] | |
| parent | 9dde3f92a7342e690f6f4a7ee8746d9b43d4c723 [diff] |
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