linux-imx

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

Resolved simple add/add conflicts:
	drivers/base/regmap/internal.h
	drivers/base/regmap/regmap.c