From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 May 2012 15:38:26 +0000 (-0700)
Subject: Merge tag 'hda-switcheroo' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... 
X-Git-Tag: v3.5-rc1~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58823de9d2f1265030d0d06cb03cc2a551994398;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge tag 'hda-switcheroo' of git://git./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
---

58823de9d2f1265030d0d06cb03cc2a551994398