Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555...
authorMark Brown <broonie@kernel.org>
Sun, 13 Mar 2016 08:19:35 +0000 (15:19 +0700)
committerMark Brown <broonie@kernel.org>
Sun, 13 Mar 2016 08:19:35 +0000 (15:19 +0700)
commitcc4f526f05ba3c51a6c8012dc9b97562112d0ba5
tree88d0376d25a9706f8d2094bf51e2deb609d8584a
parent85e8e17cfa082a86c0729bc2e2aef283aa9b372b
parentb8ad9117bf661d1a190d84de538fedde385f3ed4
parent2be2b0987d0fa7167be821a128602e3f01f017ce
parent2b9254318d7c5040fc781dfa61af3f83d55324f1
parent9e5a056a501afbb02d8042a6e1ebc9cd6e28fde2
parent00814db1e6dbe7645ebdf639a2e5171fc30b10b2
Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555', 'regulator/topic/gpio', 'regulator/topic/hi655x' and 'regulator/topic/lp872x' into regulator-next
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/core.c