Merge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 4 May 2015 11:50:18 +0000 (12:50 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 4 May 2015 11:50:18 +0000 (12:50 +0100)

Trivial merge