Merge branch 'fix/omap' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 24 Aug 2016 09:32:41 +0000 (10:32 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 24 Aug 2016 09:32:41 +0000 (10:32 +0100)

Trivial merge