| commit | 44ada1a147fa28ae15b83a031c48fc2b992cc3ef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 29 08:47:53 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 29 08:47:53 2009 -0700 |
| tree | 253d910ef02c8c864fffce7b70bcc7c68697df2b | |
| parent | b8e7e40abeac49644fec4a4f52ffe74c7b05eca0 [diff] | |
| parent | 817682c11bb836cfe688b5601aa66f2b58a4848e [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: 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