Merge branch 'asoc-omap' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 25 Aug 2012 20:31:39 +0000 (13:31 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 25 Aug 2012 20:31:39 +0000 (13:31 -0700)
1  2 
sound/soc/omap/omap-mcbsp.c

Simple merge