tree e5d4e5c0b5c00ce2d3b1949a36f0d1b032a1a28e
parent 07ac2296fb24e40ba8271a08167b588f4bbbe90c
parent b764de2d8bafff3a52aa6ee66cedf435486974f4
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1349373454 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1349373454 +0100

Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7