Merge branch 'topic/discharge' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
authorMark Brown <broonie@kernel.org>
Wed, 2 Mar 2016 14:31:35 +0000 (23:31 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 2 Mar 2016 14:31:35 +0000 (23:31 +0900)

Trivial merge