]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
projects / mirror_ubuntu-artful-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b7eba4 6091106)
Merge tag 'hda-switcheroo' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 May 2012 15:38:26 +0000 (08:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 May 2012 15:38:26 +0000 (08:38 -0700)
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

1  2 
sound/pci/hda/hda_codec.c patch | diff1 | diff2 | blob | history
sound/pci/hda/hda_codec.h patch | diff1 | diff2 | blob | history
sound/pci/hda/hda_intel.c patch | diff1 | diff2 | blob | history

diff --cc sound/pci/hda/hda_codec.c
Simple merge
diff --cc sound/pci/hda/hda_codec.h
Simple merge
diff --cc sound/pci/hda/hda_intel.c
Simple merge
Ubuntu Artful kernel mirror