Merge remote-tracking branch 'regulator/topic/core' into regulator-next
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:02 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:02 +0000 (17:08 +0100)
1  2 
drivers/regulator/core.c
include/linux/regulator/consumer.h

Simple merge
Simple merge