Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 23 Sep 2015 18:01:30 +0000 (11:01 -0700)
committerMark Brown <broonie@kernel.org>
Wed, 23 Sep 2015 18:01:30 +0000 (11:01 -0700)

Trivial merge