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)
commitf27a5fb424d4897edd3c7735ecf054ee57a5dbd0
treea6bc4d322341ee1211657302f41614b52572b207
parent6979380d85fd9e1ff701021206b315fcd66b510e
parent9efdd27678ef5e22c27c230a08a211b702768f3a
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
drivers/regulator/core.c
include/linux/regulator/consumer.h