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

Trivial merge