From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 13 Jun 2011 18:21:09 +0000 (+0100)
Subject: Merge branch 'for-3.0' into for-3.1
X-Git-Tag: v3.1-rc1~271^2~2^2~65
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1;p=pandora-kernel.git

Merge branch 'for-3.0' into for-3.1

Trival fixup for move of I/O code into separate file.

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

65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1
Reading git-diff-tree failed