From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 8 Dec 2010 13:54:33 +0000 (+0000)
Subject: Merge branch 'for-2.6.37' into for-2.6.38
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59;p=linux.git

Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
	sound/soc/soc-core.c

Axel's fix on two different branches.
---

5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59