Merge branch 'topic/rt5640' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 1 Oct 2014 16:04:24 +0000 (17:04 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 1 Oct 2014 16:04:24 +0000 (17:04 +0100)

Trivial merge