Merge branch 'topic/rt5640' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 5 Jan 2016 12:37:06 +0000 (12:37 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 5 Jan 2016 12:37:06 +0000 (12:37 +0000)

Trivial merge