From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 28 Jan 2013 16:51:05 +0000 (+0800)
Subject: Merge remote-tracking branch 'asoc/fix/adsp' into asoc-adsp
X-Git-Tag: v3.9-rc1~129^2~24^2~27^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06dc374c70fd75fb3f81a4c1f6586d7c5b8e3833;p=pandora-kernel.git

Merge remote-tracking branch 'asoc/fix/adsp' into asoc-adsp

Conflicts:
	sound/soc/codecs/wm_adsp.c
---

06dc374c70fd75fb3f81a4c1f6586d7c5b8e3833
Reading git-diff-tree failed