Merge remote-tracking branches 'asoc/topic/pm-ops', 'asoc/topic/pxa' and 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:55:41 +0000 (15:55 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:55:41 +0000 (15:55 +0100)

Trivial merge