From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 15 Aug 2011 13:48:19 +0000 (+0900)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.2-rc1~127^2~2^2~1^2~104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7e828896d5d131b58088e3ea076b865caf12663;p=pandora-kernel.git

Merge branch 'for-3.1' into for-3.2

Remove the bodge for ad193x.

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

a7e828896d5d131b58088e3ea076b865caf12663
Reading git-diff-tree failed