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-Tag: firefly_0821_release~176^2~2367^2~13^2~6^4~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a5b69017e1923ce467c6e0c6231e0882f4afe56;p=firefly-linux-kernel-4.4.55.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