Merge branch 'topic/dpcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 22 May 2015 13:12:56 +0000 (14:12 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 22 May 2015 13:12:56 +0000 (14:12 +0100)

Trivial merge