Skip to content
GitLab
Commit 4c0c9cab authored by Mark Brown's avatar Mark Brown
Browse files

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

Conflicts:
	drivers/regulator/palmas-regulator.c
parents d6f83370 5b01bd11
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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