summaryrefslogtreecommitdiff
path: root/sound/pci/maestro3.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-04-26 11:04:19 +0300
committerTakashi Iwai <tiwai@suse.de>2016-04-26 11:12:46 +0300
commita33d59599653edc6469c582f0ffd99c5fc58af04 (patch)
tree3edf0d94ce44dc12139d90ff850bbf222e82db5e /sound/pci/maestro3.c
parent58a8738cfcdec389b3764a636303f97b57f85193 (diff)
parentbb03ed216370cb021f377f923471e56d1de3ff5d (diff)
downloadlinux-a33d59599653edc6469c582f0ffd99c5fc58af04.tar.xz
Merge branch 'for-linus' into for-next
For taking back the recent change of HDA HDMI fixes for i915 HSW/BDW. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/maestro3.c')
0 files changed, 0 insertions, 0 deletions