From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 17 Jan 2013 06:31:54 +0000 (+0900)
Subject: Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona
X-Git-Tag: v3.9-rc1~129^2~24^2~25^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4706ccbbe89c0c1871134f493de8b27864b869ba;p=pandora-kernel.git

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

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

4706ccbbe89c0c1871134f493de8b27864b869ba
Reading git-diff-tree failed