Merge remote-tracking branches 'regulator/topic/da9211', 'regulator/topic/getreg...
authorMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 17:29:21 +0000 (18:29 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 17:29:21 +0000 (18:29 +0100)
1  2  3  4  5 
drivers/regulator/core.c
include/linux/regulator/consumer.h

Simple merge
Simple merge