Merge remote-tracking branches 'regulator/topic/fixed', 'regulator/topic/id-const...
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:05 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:05 +0000 (17:08 +0100)
1  2  3  4  5  6 
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/core.c

Simple merge
Simple merge
Simple merge