Merge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 4 Nov 2016 17:45:33 +0000 (11:45 -0600)
committerMark Brown <broonie@kernel.org>
Fri, 4 Nov 2016 17:45:33 +0000 (11:45 -0600)

Trivial merge