icro.com> 1312782979 +0900 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 In