Merge branch 'topic/rt5640' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 15 Aug 2016 14:12:00 +0000 (15:12 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 15 Aug 2016 14:12:00 +0000 (15:12 +0100)

Trivial merge