Merge remote-tracking branches 'regulator/topic/anatop', 'regulator/topic/arizona...

diff --cc Documentation/devicetree/bindings/regulator/anatop-regulator.txt
Simple merge

diff --cc MAINTAINERS
index 38d3e4ed7208bb3969abcbfc76c4e68fd90d12f5,9bf5aa617cf20248ea05f5e90c1d2ef3a776e59a,6ed8ef18e7b600e4edd4c1c0a47f61d4b4198d08,c265a5fe48481f548629079cb529137e0a377f31,9bf5aa617cf20248ea05f5e90c1d2ef3a776e59a..785343129ca096975eeaf8d2bc69d6a17305655f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -2589,22 -2536,7 -2588,9 -2588,9 -2536,7 +2589,22 @@@@@@ M:      Daniel Borkmann <daniel@iogearbox.ne
     L: netdev@vger.kernel.org
     L: linux-kernel@vger.kernel.org
     S: Supported
 ++++F: arch/x86/net/bpf_jit*
 ++++F: Documentation/networking/filter.txt
 ++++F: include/linux/bpf*
 ++++F: include/linux/filter.h
 ++++F: include/uapi/linux/bpf*
 ++++F: include/uapi/linux/filter.h
     F: kernel/bpf/
  -- F: tools/testing/selftests/bpf/
 ++++F: kernel/trace/bpf_trace.c
 +  +F: lib/test_bpf.c
 ++++F: net/bpf/
 ++++F: net/core/filter.c
 ++++F: net/sched/act_bpf.c
 ++++F: net/sched/cls_bpf.c
 ++++F: samples/bpf/
 ++++F: tools/net/bpf*
 ++++F: tools/testing/selftests/bpf/
     
     BROADCOM B44 10/100 ETHERNET DRIVER
     M: Michael Chan <michael.chan@broadcom.com>
@@@@@@ -8324,13 -8006,6 -8302,14 -8302,14 -8006,6 +8324,13 @@@@@@ F:    drivers/media/platform/atmel/atmel-i
     F: drivers/media/platform/atmel/atmel-isc-regs.h
     F: devicetree/bindings/media/atmel-isc.txt
     
  -- F: include/linux/platform_data/usb251xb.h
 +  +MICROCHIP USB251XB DRIVER
 +  +M: Richard Leitner <richard.leitner@skidata.com>
 +  +L: linux-usb@vger.kernel.org
 +  +S: Maintained
 +  +F: drivers/usb/misc/usb251xb.c
 +  +F: Documentation/devicetree/bindings/usb/usb251xb.txt
 +  +
     MICROSOFT SURFACE PRO 3 BUTTON DRIVER
     M: Chen Yu <yu.c.chen@intel.com>
     L: platform-driver-x86@vger.kernel.org
@@@@@@ -13319,9 -12814,8 -13296,9 -13296,9 -12814,8 +13319,9 @@@@@@ F:  drivers/virtio
     F: tools/virtio/
     F: drivers/net/virtio_net.c
     F: drivers/block/virtio_blk.c
 ----F: include/linux/virtio_*.h
 ++++F: include/linux/virtio*.h
     F: include/uapi/linux/virtio_*.h
 +  +F: drivers/crypto/virtio/
     
     VIRTIO DRIVERS FOR S390
     M: Christian Borntraeger <borntraeger@de.ibm.com>

diff --cc drivers/regulator/Kconfig
index be06eb29c6817bd30f5747384e2da7432f87644c,936f7ccc9736f8c550f712f6cb9fd8c8622ce29c,c026b09c479c84a431cd36e109ca19f2ed122e01,a27b97c5695b24c39b111219dae6c95eb65d027d,936f7ccc9736f8c550f712f6cb9fd8c8622ce29c..9ecd70373f0bd2231da7041d797ee4a62367fc8f
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
--- 3/drivers/regulator/Kconfig
--- 4/drivers/regulator/Kconfig
--- 5/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@@ -163,13 -163,6 -171,13 -163,24 -163,6 +171,24 @@@@@@ config REGULATOR_BCM590X
          BCM590xx PMUs. This will enable support for the software
          controllable LDO/Switching regulators.
     
+++ +config REGULATOR_BD9571MWV
+++ +   tristate "ROHM BD9571MWV Regulators"
+++ +   depends on MFD_BD9571MWV
+++ +   help
+++ +     This driver provides support for the voltage regulators on the
+++ +     ROHM BD9571MWV PMIC. This will enable support for the software
+++ +     controllable regulator and voltage sampling units.
+++ +
+++ +     This driver can also be built as a module. If so, the module
+++ +     will be called bd9571mwv-regulator.
+++ +
 +  +config REGULATOR_CPCAP
 +  +   tristate "Motorola CPCAP regulator"
 +  +   depends on MFD_CPCAP
 +  +   help
 +  +     Say y here for CPCAP regulator found on some Motorola phones
 +  +     and tablets such as Droid 4.
 +  +
     config REGULATOR_DA903X
        tristate "Dialog Semiconductor DA9030/DA9034 regulators"
        depends on PMIC_DA903X

diff --cc drivers/regulator/Makefile
Simple merge

diff --cc drivers/regulator/anatop-regulator.c
Simple merge

diff --cc drivers/regulator/max77693-regulator.c
Simple merge

diff --cc drivers/regulator/s2mpa01.c
Simple merge