Merge remote-tracking branches 'asoc/topic/ssm2518' and 'asoc/topic/sunxi' into asoc...
authorMark Brown <broonie@kernel.org>
Mon, 26 Oct 2015 02:16:16 +0000 (11:16 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 26 Oct 2015 02:16:16 +0000 (11:16 +0900)

Trivial merge