tree f23dbd2ec7cbd348fa80fce7500ac026cf6df13a
parent dd31f591011f83f74344dcb2e63c67348b61db9a
parent 9fc4cd828107d0196b1ac0f5dec1f3b747542470
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1360580779 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1360580779 +0000

Merge remote-tracking branch 'asoc/fix/ux500' into asoc-next