tree ed71d59c4b8962051eb73b5bbdcfa5d95930ddd4
parent 7ae34336285c9405e39430ad932c7c1a6cc01996
parent 796718925159523919a589ecbd6d1811c22ef55f
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1369752096 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1369752096 +0100

Merge remote-tracking branch 'asoc/fix/davinci' into asoc-linus