Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
authorMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)
1  2 
drivers/regulator/core.c
include/linux/regulator/consumer.h

Simple merge
Simple merge