Merge remote-tracking branches 'asoc/fix/davinci' and 'asoc/fix/max98090' into asoc...
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:50 +0000 (12:48 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:50 +0000 (12:48 +0100)

Trivial merge