Merge remote-tracking branch 'regmap/for-next'

Conflicts:
	drivers/mfd/wm831x-spi.c

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

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/wm8994-core.c
Simple merge

diff --cc include/linux/mfd/wm831x/core.h
Simple merge

diff --cc include/linux/mfd/wm8994/core.h
index 1478f9875bb3bd8938ce044760032e5547363064,45df450d869f577897e5194f85ee315099431f3b..f44bdb7273bd819b5c30b4dba7d808a4ad46e015
--- 1/include/linux/mfd/wm8994/core.h
--- 2/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@@ -57,15 -56,8 +57,10 @@@ struct wm8994 
        enum wm8994_type type;
  
        struct device *dev;
-       int (*read_dev)(struct wm8994 *wm8994, unsigned short reg,
-                       int bytes, void *dest);
-       int (*write_dev)(struct wm8994 *wm8994, unsigned short reg,
-                        int bytes, const void *src);
- 
-       void *control_data;
+       struct regmap *regmap;
  
 +      bool ldo_ena_always_driven;
 +
        int gpio_base;
        int irq_base;