From: Mark Brown <broonie@kernel.org>
Date: Wed, 2 Mar 2016 14:31:35 +0000 (+0900)
Subject: Merge branch 'topic/discharge' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... 
X-Git-Tag: v4.6-rc1~146^2~2^3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07a06694cb591592842b608dd3ada839503f1134;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'topic/discharge' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-max77620
---

07a06694cb591592842b608dd3ada839503f1134