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

Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next 

Simple add/add conflict:
	drivers/base/regmap/regmap.c
parents 4a6be7bb a6539c32
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