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

Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next 

Conflicts (trivial context stuff):
	drivers/base/regmap/regmap.c
	include/linux/regmap.h
parents 46335119 a43fd50d 632a5b01
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