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

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

b42af319f26bcb7d84b42b4bd0ca3b84ba94b160
Reading git-diff-tree failed