Merge branch 'fix/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 21 Jul 2015 17:08:05 +0000 (18:08 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 21 Jul 2015 17:08:05 +0000 (18:08 +0100)

Trivial merge