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

diff --cc drivers/base/regmap/internal.h
index 2cad787fa548af5409b7e16bab9fd258062e7e5c,e22bb80edff145707ff489504d9453eead87cdcb..70ca270b77e2838b0ac87f398d3e2ee5576637cf
--- 1/drivers/base/regmap/internal.h
--- 2/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@@ -192,9 -175,8 +192,10 @@@ bool regcache_set_val(void *base, unsig
                      unsigned int val, unsigned int word_size);
  int regcache_lookup_reg(struct regmap *map, unsigned int reg);
  
 +void regmap_async_complete_cb(struct regmap_async *async, int ret);
 +
  extern struct regcache_ops regcache_rbtree_ops;
  extern struct regcache_ops regcache_lzo_ops;
+ extern struct regcache_ops regcache_flat_ops;
  
  #endif

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