Merge branch 'asoc-omap' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:19:01 +0000 (20:19 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:19:01 +0000 (20:19 +0100)
commit2bbf6078dc948e87564c1a947f23ea4cf2349a13
tree2fc93ee7a26febb4ff9554e40043f8e097726c6d
parent02e79476998ba7e62842d20dca898c403ad55c7e
parentb8101048f0f3cd281ed4c4901e38ae2bcfb32030
Merge branch 'asoc-omap' into for-3.7
sound/soc/omap/omap-mcbsp.c