From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 15 Aug 2010 13:56:40 +0000 (+0100)
Subject: Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v2.6.37-rc1~126^2~1^2~160
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1;p=pandora-kernel.git

Merge branch 'for-2.6.36' of git://git./linux/kernel/git/broonie/sound-2.6 into for-2.6.37

Trivial overlap with the removal of the local revision variable.

Conflicts:
	sound/soc/codecs/wm8994.c
---

ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1
Reading git-diff-tree failed