Merge branch 'topic/cs47l24' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:20:47 +0000 (00:20 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:20:47 +0000 (00:20 +0000)

Trivial merge