From: Mark Brown <broonie@linaro.org>
Date: Sat, 28 Jun 2014 12:55:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/debugfs' into asoc-component
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~144^2~5^2~16^2~10^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=211bcc6c3af90f3ee1f1297349d9d692e5f1c7e0;p=pandora-kernel.git

Merge remote-tracking branch 'asoc/fix/debugfs' into asoc-component

Conflicts:
	sound/soc/soc-core.c
---

211bcc6c3af90f3ee1f1297349d9d692e5f1c7e0
Reading git-diff-tree failed