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

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

Conflicts:
	drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)
parents 178e43ae 411a2df5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment