Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 11 Dec 2011 03:24:44 +0000 (11:24 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 11 Dec 2011 03:24:44 +0000 (11:24 +0800)
commit43a95197581ac58081772eab3bd5f114da87f98b
treebc03d0cd7ca07f4b345c4d54d1293bed03ebc1c4
parent7c08be84f83b23762fb7571ac9a4aea3c34d1a66
parent9fd369b193dceddd4e9e7f426c229c6104c80e28
Merge branch 'for-3.2' into for-3.3

Conflicts:
sound/soc/mxs/mxs-pcm.c
sound/soc/mxs/mxs-pcm.c
sound/soc/mxs/mxs-sgtl5000.c