Merge branches 'topic/rt298', 'topic/ts3a227e' and 'topic/cs42xx8' of git://git.kerne...
authorMark Brown <broonie@kernel.org>
Wed, 15 Jul 2015 11:50:33 +0000 (12:50 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 15 Jul 2015 11:50:33 +0000 (12:50 +0100)

Trivial merge