Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/stub'...
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)
1  2  3  4  5  6 
include/linux/regulator/consumer.h

Simple merge