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)
commitc3313b0ce8e70d6c5e556664090c6ab311cb892a
tree0c2dce1e8d6912cc302aa305bb8df91f6bdeb087
parent7171511eaec5bf23fb06078f59784a3a0626b38f
parentb14903e10a06347234b387f7364f86aa07252d9f
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
include/linux/regulator/consumer.h