Merge branch 'fix/cache' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-cache

Conflicts:
	drivers/base/regmap/regcache.c