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

Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers 

Conflicts:
	drivers/regulator/Kconfig
parents 6a642509 fbf79744
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