Merge branch 'topic/adsp' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 2 Jun 2015 20:06:04 +0000 (21:06 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 2 Jun 2015 20:06:04 +0000 (21:06 +0100)

Trivial merge