Merge remote-tracking branches 'asoc/topic/rcar' and 'asoc/topic/rockchip' into asoc...
authorMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:38 +0000 (13:54 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:38 +0000 (13:54 +0000)

Trivial merge