| commit | 58823de9d2f1265030d0d06cb03cc2a551994398 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 25 08:38:26 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 25 08:38:26 2012 -0700 |
| tree | 6b4f3e681f467e99758de61d6dd0c45a39e7d133 | |
| parent | 4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85 [diff] | |
| parent | 6091106297933c5cf0e4470df9a5f4e703674391 [diff] |
Merge tag 'hda-switcheroo' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull VGA-switcheroo audio client support for HD-audio from Takashi Iwai. This depended on the recent drm pull. * tag 'hda-switcheroo' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - unlock on error in azx_interrupt() ALSA: hda - Support VGA-switcheroo ALSA: hda - Export snd_hda_lock_devices() ALSA: hda - Check the dead HDMI audio controller by vga-switcheroo