Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 15:05:56 +0000 (16:05 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 15:05:56 +0000 (16:05 +0100)
1  2 
include/linux/regulator/consumer.h

Simple merge