Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Dec 2011 00:53:23 +0000 (00:53 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Dec 2011 00:53:23 +0000 (00:53 +0000)
1  2 
sound/soc/mxs/mxs-pcm.c

Simple merge