Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/rockchip', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Wed, 24 Dec 2014 12:56:44 +0000 (12:56 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 24 Dec 2014 12:56:44 +0000 (12:56 +0000)

Trivial merge