Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 13:40:11 +0000 (14:40 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 13:40:11 +0000 (14:40 +0100)
commitaaa9b649d0868725cd7536bc9017fe3956ad5393
tree13dacc6078ebbf50b4ffdf8a00df3145e460b29c
parent3e683126f4b42bd29ac5adff1eb178880aa7706a
parent5a286aae3d2c6e494fbcafdf4e911e2e976562a8
parente2adfacde619d8e39dc8c02919bd2524d3c39588
parenta13eaf02e2d6326a59f142db329faf4efb527e79
parent5127e31a6ce04bd41a020c0ba28a1c0915ab6da1
parent30f93ca8323f0c21b789bea0f7db8e8e3a7915c6
Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tol' into regulator-next
drivers/regulator/Kconfig
drivers/regulator/Makefile
include/linux/regulator/consumer.h