Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865

Conflicts:
	drivers/regulator/act8865-regulator.c
This commit is contained in:
Mark Brown 2014-08-05 18:14:31 +01:00
commit 7cad4c8f76

Diff content is not available