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: hda - Compaq Presario CQ60 patching for Conexant sound: usb-audio: make the MotU Fastlane work again ALSA: Enable PCM hw_ptr_jiffies check only in xrun_debug mode ALSA: Fix invalid jiffies check after pause
Showing
- Documentation/sound/alsa/Procfile.txt 5 additions, 0 deletionsDocumentation/sound/alsa/Procfile.txt
- sound/core/pcm_lib.c 8 additions, 2 deletionssound/core/pcm_lib.c
- sound/core/pcm_native.c 6 additions, 0 deletionssound/core/pcm_native.c
- sound/pci/hda/patch_conexant.c 1 addition, 0 deletionssound/pci/hda/patch_conexant.c
- sound/usb/usbaudio.c 1 addition, 1 deletionsound/usb/usbaudio.c
- sound/usb/usbaudio.h 1 addition, 1 deletionsound/usb/usbaudio.h
- sound/usb/usbmidi.c 11 additions, 1 deletionsound/usb/usbmidi.c
- sound/usb/usbquirks.h 1 addition, 1 deletionsound/usb/usbquirks.h
Loading
Please register or sign in to comment