From: Mark Brown <broonie@linaro.org>
Date: Tue, 13 May 2014 17:23:56 +0000 (+0100)
Subject: Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~21^2~52^2~3^3~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bee1fd482622718fcc1a537db1d7ca48d7f52f8;p=pandora-kernel.git

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

Conflicts:
	sound/soc/intel/sst-baytrail-dsp.c
---

8bee1fd482622718fcc1a537db1d7ca48d7f52f8
Reading git-diff-tree failed