Merge remote-tracking branches 'regmap/topic/patch' and 'regmap/topic/sync' into...

diff --cc drivers/base/regmap/internal.h
Simple merge

diff --cc drivers/base/regmap/regcache-lzo.c
Simple merge

diff --cc drivers/base/regmap/regcache-rbtree.c
Simple merge

diff --cc drivers/base/regmap/regcache.c
Simple merge

diff --cc include/linux/regmap.h
Simple merge