]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:34 +0000 (15:52 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:34 +0000 (15:52 +0000)
1  2 
sound/soc/intel/atom/sst/sst_acpi.c

Simple merge