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
Showing
- sound/core/pcm.c 6 additions, 0 deletionssound/core/pcm.c
- sound/oss/sound_timer.c 1 addition, 1 deletionsound/oss/sound_timer.c
- sound/pci/asihpi/hpi6205.c 5 additions, 2 deletionssound/pci/asihpi/hpi6205.c
- sound/pci/hda/patch_realtek.c 1 addition, 0 deletionssound/pci/hda/patch_realtek.c
- sound/soc/soc-core.c 1 addition, 1 deletionsound/soc/soc-core.c
Loading
Please register or sign in to comment