summaryrefslogtreecommitdiff
path: root/drivers/parport
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-25 19:38:26 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-25 19:38:26 +0400
commit58823de9d2f1265030d0d06cb03cc2a551994398 (patch)
tree6b4f3e681f467e99758de61d6dd0c45a39e7d133 /drivers/parport
parent4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85 (diff)
parent6091106297933c5cf0e4470df9a5f4e703674391 (diff)
downloadlinux-58823de9d2f1265030d0d06cb03cc2a551994398.tar.xz
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
Diffstat (limited to 'drivers/parport')
0 files changed, 0 insertions, 0 deletions