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

diff --cc sound/soc/codecs/sgtl5000.c
Simple merge

diff --cc sound/soc/codecs/wm_hubs.c
Simple merge