Merge branch 'topic/sink' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 1 Dec 2015 18:14:13 +0000 (18:14 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 1 Dec 2015 18:14:13 +0000 (18:14 +0000)

Trivial merge