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

Browse Source

Conflicts:
	drivers/regulator/act8865-regulator.c

...

This commit is contained in:

Mark Brown 2014-08-05 18:14:31 +01:00

parent 34e0247ffc 732714d0da

commit 7cad4c8f76

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available