Merge remote-tracking branches 'regmap/topic/noinc' and 'regmap/topic/single-rw'...

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

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

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

diff --cc sound/soc/codecs/rt5514.c
Simple merge

diff --cc sound/soc/codecs/rt5682.c
Simple merge