Merge branch 'for-2.6.36' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Aug 2010 12:38:11 +0000 (13:38 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Aug 2010 12:38:11 +0000 (13:38 +0100)
1  2 
sound/soc/imx/imx-ssi.c

Simple merge