Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/fix/act8865' into regulator-a…
Browse files Browse the repository at this point in the history
…ct8865

Conflicts:
	drivers/regulator/act8865-regulator.c
  • Loading branch information
Mark Brown committed Aug 5, 2014
2 parents 34e0247 + 732714d commit 7cad4c8
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 7cad4c8

Please sign in to comment.