Merge branch 'fix/qcom' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 31 Oct 2016 18:31:07 +0000 (12:31 -0600)
committerMark Brown <broonie@kernel.org>
Mon, 31 Oct 2016 18:31:07 +0000 (12:31 -0600)

Trivial merge