Skip to content
Commit bf1fc23c authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/88pm800' of... 

Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-88pm800

Conflicts:
	drivers/regulator/88pm800.c
parents fa26e4d2 322dfa64
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment