Merge branch 'fix/mmio' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 5 Feb 2016 12:51:07 +0000 (12:51 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Feb 2016 12:51:07 +0000 (12:51 +0000)

Trivial merge