Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 05:56:19 +0000 (14:56 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 05:56:19 +0000 (14:56 +0900)
commit18d4ed4342c14ebeebe60d267b171053efcdfa87
treef315e77f66cbb70869e2f80cde5c18380a80901e
parent722d0daf2b607a32dad1357bf797e3803484af0a
parent22de4534ae12d61257fc0e53d2571686b03305bc
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
sound/soc/codecs/sgtl5000.c
sound/soc/codecs/wm_hubs.c