From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 8 Aug 2011 05:56:19 +0000 (+0900)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: next-20110809~30^2~1
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=18d4ed4342c14ebeebe60d267b171053efcdfa87;p=karo-tx-linux.git

Merge branch 'for-3.1' into for-3.2

Conflict due to the fix for the register map failure - taken the for-3.1
version.

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

18d4ed4342c14ebeebe60d267b171053efcdfa87