From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 15 Aug 2009 10:20:44 +0000 (+0100)
Subject: Merge branch 'for-2.6.32' into mxc
X-Git-Tag: v2.6.32-rc1~166^2~83
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08229de4b42816079ed5d15f0689fcd0af946d5e;p=pandora-kernel.git

Merge branch 'for-2.6.32' into mxc

Conflicts:
	sound/soc/Makefile
---

08229de4b42816079ed5d15f0689fcd0af946d5e
Reading git-diff-tree failed