Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/rockchip', 'asoc...
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:49:02 +0000 (12:49 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:49:02 +0000 (12:49 +0100)

Trivial merge