Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/max98090', 'asoc/fix...
authorMark Brown <broonie@kernel.org>
Wed, 10 Sep 2014 11:21:03 +0000 (12:21 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 10 Sep 2014 11:21:03 +0000 (12:21 +0100)

Trivial merge