| commit | 7dfb2d4069cc698da925327e8c2106852a0c77a2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 18 09:30:08 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 18 09:30:08 2010 -0700 |
| tree | a4143d70c25365f21d46be44eda3bbb5eb98bc9f | |
| parent | 6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8 [diff] | |
| parent | 2ea1ef5789c52dfdff6da81bc0d2eb8b62f73c23 [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: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter) ALSA: hda - Fix ALC680 base model capture ASoC: Remove DSP mode support for WM8776 ALSA: hda - Add quirk for Dell Vostro 1220 ALSA: riptide - Fix detection / load of firmware files