Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
authorMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:11:39 +0000 (11:11 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:11:39 +0000 (11:11 +0100)
commitaef393da7501693a1b91a1cfed1a9ea408ceabe6
tree98af035479b8eb412a33259880a037169378cfa6
parent88c260a180817093682af8bd311ca141ba3952c9
parent4040394e12cb1eed21d1306cacdc8a6f0464c8e2
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
drivers/regulator/Kconfig
drivers/regulator/core.c
include/linux/regulator/machine.h