Merge branch 'topic/ocp' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 17:29:31 +0000 (18:29 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 17:29:31 +0000 (18:29 +0100)

Trivial merge