From: Mark Brown <broonie@kernel.org>
Date: Thu, 5 Feb 2015 20:18:39 +0000 (+0000)
Subject: Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8a5b69017e1923ce467c6e0c6231e0882f4afe56;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'fix/intel' of git://git./linux/kernel/git/broonie/sound into asoc-intel

Conflicts:
	sound/soc/intel/sst/sst_acpi.c
---

8a5b69017e1923ce467c6e0c6231e0882f4afe56