From: Mark Brown Date: Mon, 8 Aug 2011 05:56:19 +0000 (+0900) Subject: Merge branch 'for-3.1' into for-3.2 X-Git-Tag: v3.2-rc1~127^2~2^2~1^2~138 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18d4ed4342c14ebeebe60d267b171053efcdfa87;p=pandora-kernel.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