summaryrefslogtreecommitdiffstats
path: root/sound/pci/intel8x0.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-07-04 07:48:57 +0200
committerTakashi Iwai <tiwai@suse.de>2014-07-04 07:48:57 +0200
commit1a0e3f9639ebe7f0f17b40eb96d03c05ec067979 (patch)
tree55a007e8903e097cc1fee52dd17887b92d60c257 /sound/pci/intel8x0.c
parentALSA: hda: Remove unused variable (diff)
parentALSA: hda - restore BCLK M/N value as per CDCLK for HSW/BDW display HDA contr... (diff)
downloadlinux-1a0e3f9639ebe7f0f17b40eb96d03c05ec067979.tar.xz
linux-1a0e3f9639ebe7f0f17b40eb96d03c05ec067979.zip
Merge branch 'for-linus' into for-next
Conflicts: sound/pci/hda/hda_intel.c
Diffstat (limited to 'sound/pci/intel8x0.c')
0 files changed, 0 insertions, 0 deletions