From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 9 Mar 2011 12:37:42 +0000 (+0000)
Subject: Merge branch 'for-2.6.38' into for-2.6.39
X-Git-Tag: v2.6.39-rc1~200^2^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15086ded21ee7f065ad290c1edfdc49cf18cf96e;p=pandora-kernel.git

Merge branch 'for-2.6.38' into for-2.6.39

Conflicts:
	sound/soc/codecs/wm8978.c
	sound/soc/soc-dapm.c
---

15086ded21ee7f065ad290c1edfdc49cf18cf96e
Reading git-diff-tree failed