From: Mark Brown <broonie@kernel.org>
Date: Thu, 8 Jan 2015 19:54:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl
X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~130^2~13^2~7^5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4536a00116f084cf20ec77f3540c481c02ad8d0e;p=pandora-kernel.git

Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl

Conflicts:
	sound/soc/fsl/fsl_ssi.c
---

4536a00116f084cf20ec77f3540c481c02ad8d0e
Reading git-diff-tree failed