From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 17 Aug 2011 07:34:05 +0000 (+0900)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.2-rc1~127^2~2^2~1^2~84
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d3106433e779cd6d5e4814eaeaec6b79a8ddd53;p=pandora-kernel.git

Merge branch 'for-3.1' into for-3.2
---

3d3106433e779cd6d5e4814eaeaec6b79a8ddd53
Reading git-diff-tree failed