Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max8973...

diff --combined MAINTAINERS
index fce0ba53ec82b7dff82a62d0a10c4c24d4ec6c10,03e00c7c88ebca4161bff9d4be82d59f3698f177,03e00c7c88ebca4161bff9d4be82d59f3698f177,e0b7b599607c480d77bc6ab5ad08b62744a12bd3,03e00c7c88ebca4161bff9d4be82d59f3698f177,03e00c7c88ebca4161bff9d4be82d59f3698f177..17cf9e6429073e6c64c66bc597b78f2e11072b8a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@ -872,9 -872,9 -872,9 -872,9 -872,9 -872,9 +872,9 @@@@@@@ F:     drivers/perf/arm_pmu.
      F:        include/linux/perf/arm_pmu.h
      
      ARM PORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/
      
@@@@@@@ -886,35 -886,35 -886,35 -886,35 -886,35 -886,35 +886,35 @@@@@@@ F:      arch/arm/plat-*
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
      
      ARM PRIMECELL AACI PL041 DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        sound/arm/aaci.*
      
      ARM PRIMECELL CLCD PL110 DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/video/fbdev/amba-clcd.*
      
      ARM PRIMECELL KMI PL050 DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/input/serio/ambakmi.*
      F:        include/linux/amba/kmi.h
      
      ARM PRIMECELL MMCI PL180/1 DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/mmc/host/mmci.*
      F:        include/linux/amba/mmci.h
      
      ARM PRIMECELL UART PL010 AND PL011 DRIVERS
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/tty/serial/amba-pl01*.c
      F:        include/linux/amba/serial.h
      
      ARM PRIMECELL BUS SUPPORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/amba/
      F:        include/linux/amba/bus.h
@@@@@@@ -1036,7 -1036,7 -1036,7 -1036,7 -1036,7 -1036,7 +1036,7 @@@@@@@ L:      linux-arm-kernel@lists.infradead.or
      S:        Maintained
      
      ARM/CLKDEV SUPPORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
      S:        Maintained
      F:        arch/arm/include/asm/clkdev.h
@@@@@@@ -1093,9 -1093,9 -1093,9 -1093,9 -1093,9 -1093,9 +1093,9 @@@@@@@ F:      arch/arm/boot/dts/cx92755
      N:        digicolor
      
      ARM/EBSA110 MACHINE SUPPORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/mach-ebsa110/
      F:        drivers/net/ethernet/amd/am79c961a.*
@@@@@@@ -1124,9 -1124,9 -1124,9 -1124,9 -1124,9 -1124,9 +1124,9 @@@@@@@ T:      git git://git.berlios.de/gemini-boar
      F:        arch/arm/mm/*-fa*
      
      ARM/FOOTBRIDGE ARCHITECTURE
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/include/asm/hardware/dec21285.h
      F:        arch/arm/mach-footbridge/
@@@@@@@ -1457,7 -1457,7 -1457,7 -1457,7 -1457,7 -1457,7 +1457,7 @@@@@@@ S:      Maintaine
      ARM/PT DIGITAL BOARD PORT
      M:        Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      
      ARM/QUALCOMM SUPPORT
@@@@@@@ -1493,9 -1493,9 -1493,9 -1493,9 -1493,9 -1493,9 +1493,9 @@@@@@@ S:      Supporte
      F:        arch/arm64/boot/dts/renesas/
      
      ARM/RISCPC ARCHITECTURE
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/include/asm/hardware/entry-macro-iomd.S
      F:        arch/arm/include/asm/hardware/ioc.h
@@@@@@@ -1773,9 -1773,9 -1773,9 -1773,9 -1773,9 -1773,9 +1773,9 @@@@@@@ F:      drivers/clk/versatile/clk-vexpress-o
      F:        drivers/clocksource/versatile.c
      
      ARM/VFP SUPPORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/vfp/
      
@@@@@@@ -2921,7 -2921,7 -2921,7 -2921,7 -2921,7 -2921,7 +2921,7 @@@@@@@ F:      mm/cleancache.
      F:        include/linux/cleancache.h
      
      CLK API
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-clk@vger.kernel.org
      S:        Maintained
      F:        include/linux/clk.h
@@@@@@@ -3354,9 -3354,9 -3354,9 -3354,9 -3354,9 -3354,9 +3354,9 @@@@@@@ S:      Supporte
      F:        drivers/net/ethernet/stmicro/stmmac/
      
      CYBERPRO FB DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        drivers/video/fbdev/cyber2000fb.*
      
@@@@@@@ -3881,7 -3881,7 -3881,7 -3881,7 -3881,7 -3881,7 +3881,7 @@@@@@@ F:      Documentation/devicetree/bindings/di
      
      DRM DRIVERS FOR VIVANTE GPU IP
      M:        Lucas Stach <l.stach@pengutronix.de>
 -----R:        Russell King <linux+etnaviv@arm.linux.org.uk>
 +++++R:        Russell King <linux+etnaviv@armlinux.org.uk>
      R:        Christian Gmeiner <christian.gmeiner@gmail.com>
      L:        dri-devel@lists.freedesktop.org
      S:        Maintained
@@@@@@@ -4223,8 -4223,8 -4223,8 -4223,8 -4223,8 -4223,8 +4223,8 @@@@@@@ F:      Documentation/efi-stub.tx
      F:        arch/ia64/kernel/efi.c
      F:        arch/x86/boot/compressed/eboot.[ch]
      F:        arch/x86/include/asm/efi.h
 -----F:        arch/x86/platform/efi/*
 -----F:        drivers/firmware/efi/*
 +++++F:        arch/x86/platform/efi/
 +++++F:        drivers/firmware/efi/
      F:        include/linux/efi*.h
      
      EFI VARIABLE FILESYSTEM
@@@@@@@ -4302,7 -4302,7 -4302,7 -4302,7 -4302,7 -4302,7 +4302,7 @@@@@@@ F:      drivers/net/ethernet/agere
      
      ETHERNET BRIDGE
      M:        Stephen Hemminger <stephen@networkplumber.org>
 -----L:        bridge@lists.linux-foundation.org
 +++++L:        bridge@lists.linux-foundation.org (moderated for non-subscribers)
      L:        netdev@vger.kernel.org
      W:        http://www.linuxfoundation.org/en/Net:Bridge
      S:        Maintained
@@@@@@@ -4744,7 -4744,7 -4744,7 -4744,7 -4744,7 -4744,7 +4744,7 @@@@@@@ F:      drivers/platform/x86/fujitsu-tablet.
      
      FUSE: FILESYSTEM IN USERSPACE
      M:        Miklos Szeredi <miklos@szeredi.hu>
 -----L:        fuse-devel@lists.sourceforge.net
 +++++L:        linux-fsdevel@vger.kernel.org
      W:        http://fuse.sourceforge.net/
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
      S:        Maintained
@@@@@@@ -4903,7 -4903,7 -4903,7 -4903,7 -4903,7 -4903,7 +4903,7 @@@@@@@ F:      net/ipv4/gre_offload.
      F:        include/net/gre.h
      
      GRETH 10/100/1G Ethernet MAC device driver
 -----M:        Kristoffer Glembo <kristoffer@gaisler.com>
 +++++M:        Andreas Larsson <andreas@gaisler.com>
      L:        netdev@vger.kernel.org
      S:        Maintained
      F:        drivers/net/ethernet/aeroflex/
@@@@@@@ -5042,7 -5042,6 -5042,6 -5042,6 -5042,6 -5042,6 +5042,7 @@@@@@@ F:      include/linux/hw_random.
      HARDWARE SPINLOCK CORE
      M:        Ohad Ben-Cohen <ohad@wizery.com>
      M:        Bjorn Andersson <bjorn.andersson@linaro.org>
 +++++L:        linux-remoteproc@vger.kernel.org
      S:        Maintained
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
      F:        Documentation/hwspinlock.txt
@@@@@@@ -5751,7 -5750,7 -5750,7 -5750,7 -5750,7 -5750,7 +5751,7 @@@@@@@ R:      Don Skidmore <donald.c.skidmore@inte
      R:        Bruce Allan <bruce.w.allan@intel.com>
      R:        John Ronciak <john.ronciak@intel.com>
      R:        Mitch Williams <mitch.a.williams@intel.com>
 -----L:        intel-wired-lan@lists.osuosl.org
 +++++L:        intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
      W:        http://www.intel.com/support/feedback.htm
      W:        http://e1000.sourceforge.net/
      Q:        http://patchwork.ozlabs.org/project/intel-wired-lan/list/
@@@@@@@ -6027,7 -6026,7 -6026,7 -6026,7 -6026,7 -6026,7 +6027,7 @@@@@@@ F:      include/scsi/*iscsi
      
      ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
      M:        Or Gerlitz <ogerlitz@mellanox.com>
 -----M:        Sagi Grimberg <sagig@mellanox.com>
 +++++M:        Sagi Grimberg <sagi@grimberg.me>
      M:        Roi Dayan <roid@mellanox.com>
      L:        linux-rdma@vger.kernel.org
      S:        Supported
@@@@@@@ -6037,7 -6036,7 -6036,7 -6036,7 -6036,7 -6036,7 +6037,7 @@@@@@@ Q:      http://patchwork.kernel.org/project/
      F:        drivers/infiniband/ulp/iser/
      
      ISCSI EXTENSIONS FOR RDMA (ISER) TARGET
 -----M:        Sagi Grimberg <sagig@mellanox.com>
 +++++M:        Sagi Grimberg <sagi@grimberg.me>
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
      L:        linux-rdma@vger.kernel.org
      L:        target-devel@vger.kernel.org
@@@@@@@ -6252,8 -6251,8 -6251,8 -6251,8 -6251,8 -6251,8 +6252,8 @@@@@@@ S:      Maintaine
      F:        tools/testing/selftests
      
      KERNEL VIRTUAL MACHINE (KVM)
 -----M:        Gleb Natapov <gleb@kernel.org>
      M:        Paolo Bonzini <pbonzini@redhat.com>
 +++++M:        Radim Krčmář <rkrcmar@redhat.com>
      L:        kvm@vger.kernel.org
      W:        http://www.linux-kvm.org
      T:        git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
@@@@@@@ -6400,10 -6399,10 -6399,10 -6399,10 -6399,10 -6399,10 +6400,10 @@@@@@@ F:       mm/kmemleak.
      F:        mm/kmemleak-test.c
      
      KPROBES
 -----M:        Ananth N Mavinakayanahalli <ananth@in.ibm.com>
 +++++M:        Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
      M:        Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
      M:        "David S. Miller" <davem@davemloft.net>
 -----M:        Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
 +++++M:        Masami Hiramatsu <mhiramat@kernel.org>
      S:        Maintained
      F:        Documentation/kprobes.txt
      F:        include/linux/kprobes.h
@@@@@@@ -6905,7 -6904,7 -6904,7 -6904,7 -6904,7 -6904,7 +6905,7 @@@@@@@ L:      linux-man@vger.kernel.or
      S:        Maintained
      
      MARVELL ARMADA DRM SUPPORT
 -----M:        Russell King <rmk+kernel@arm.linux.org.uk>
 +++++M:        Russell King <rmk+kernel@armlinux.org.uk>
      S:        Maintained
      F:        drivers/gpu/drm/armada/
      
@@@@@@@ -7020,9 -7019,9 -7019,9 -7019,9 -7019,9 -7019,9 +7020,9 @@@@@@@ M:      Chanwoo Choi <cw00.choi@samsung.com
      M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
      L:        linux-kernel@vger.kernel.org
      S:        Supported
--- --F:        drivers/*/max14577.c
+++ ++F:        drivers/*/max14577*.c
      F:        drivers/*/max77686*.c
--- --F:        drivers/*/max77693.c
+++ ++F:        drivers/*/max77693*.c
      F:        drivers/extcon/extcon-max14577.c
      F:        drivers/extcon/extcon-max77693.c
      F:        drivers/rtc/rtc-max77686.c
@@@@@@@ -7576,7 -7575,7 -7575,7 -7575,7 -7575,7 -7575,7 +7576,7 @@@@@@@ F:      drivers/infiniband/hw/nes
      
      NETEM NETWORK EMULATOR
      M:        Stephen Hemminger <stephen@networkplumber.org>
 -----L:        netem@lists.linux-foundation.org
 +++++L:        netem@lists.linux-foundation.org (moderated for non-subscribers)
      S:        Maintained
      F:        net/sched/sch_netem.c
      
@@@@@@@ -7905,7 -7904,7 -7904,7 -7904,7 -7904,7 -7904,7 +7905,7 @@@@@@@ S:      Supporte
      F:        drivers/nfc/nxp-nci
      
      NXP TDA998X DRM DRIVER
 -----M:        Russell King <rmk+kernel@arm.linux.org.uk>
 +++++M:        Russell King <rmk+kernel@armlinux.org.uk>
      S:        Supported
      F:        drivers/gpu/drm/i2c/tda998x_drv.c
      F:        include/drm/i2c/tda998x.h
@@@@@@@ -7978,7 -7977,7 -7977,7 -7977,7 -7977,7 -7977,7 +7978,7 @@@@@@@ F:      arch/arm/*omap*/*pm
      F:        drivers/cpufreq/omap-cpufreq.c
      
      OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 -----M:        Rajendra Nayak <rnayak@ti.com>
 +++++M:        Rajendra Nayak <rnayak@codeaurora.org>
      M:        Paul Walmsley <paul@pwsan.com>
      L:        linux-omap@vger.kernel.org
      S:        Maintained
@@@@@@@ -8254,7 -8253,7 -8253,7 -8253,7 -8253,7 -8253,7 +8254,7 @@@@@@@ F:      Documentation/filesystems/overlayfs.
      
      ORANGEFS FILESYSTEM
      M:        Mike Marshall <hubcap@omnibond.com>
 -----L:        pvfs2-developers@beowulf-underground.org
 +++++L:        pvfs2-developers@beowulf-underground.org (subscribers-only)
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
      S:        Supported
      F:        fs/orangefs/
@@@@@@@ -8712,8 -8711,6 -8711,6 -8711,6 -8711,6 -8711,6 +8712,8 @@@@@@@ F:      drivers/pinctrl/sh-pfc
      
      PIN CONTROLLER - SAMSUNG
      M:        Tomasz Figa <tomasz.figa@gmail.com>
 +++++M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +++++M:        Sylwester Nawrocki <s.nawrocki@samsung.com>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
      L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
      S:        Maintained
@@@@@@@ -9142,13 -9139,6 -9139,6 -9139,6 -9139,6 -9139,6 +9142,13 @@@@@@@ T:    git git://github.com/KrasnikovEugene
      S:        Supported
      F:        drivers/net/wireless/ath/wcn36xx/
      
 +++++QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
 +++++M:        Gabriel Somlo <somlo@cmu.edu>
 +++++M:        "Michael S. Tsirkin" <mst@redhat.com>
 +++++L:        qemu-devel@nongnu.org
 +++++S:        Maintained
 +++++F:        drivers/firmware/qemu_fw_cfg.c
 +++++
      RADOS BLOCK DEVICE (RBD)
      M:        Ilya Dryomov <idryomov@gmail.com>
      M:        Sage Weil <sage@redhat.com>
@@@@@@@ -9324,7 -9314,6 -9314,6 -9314,6 -9314,6 -9314,6 +9324,7 @@@@@@@ F:      include/linux/regmap.
      REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
      M:        Ohad Ben-Cohen <ohad@wizery.com>
      M:        Bjorn Andersson <bjorn.andersson@linaro.org>
 +++++L:        linux-remoteproc@vger.kernel.org
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
      S:        Maintained
      F:        drivers/remoteproc/
@@@@@@@ -9334,7 -9323,6 -9323,6 -9323,6 -9323,6 -9323,6 +9334,7 @@@@@@@ F:      include/linux/remoteproc.
      REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
      M:        Ohad Ben-Cohen <ohad@wizery.com>
      M:        Bjorn Andersson <bjorn.andersson@linaro.org>
 +++++L:        linux-remoteproc@vger.kernel.org
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
      S:        Maintained
      F:        drivers/rpmsg/
@@@@@@@ -10014,8 -10002,7 -10002,7 -10002,7 -10002,7 -10002,7 +10014,8 @@@@@@@ F:       drivers/infiniband/hw/ocrdma
      
      SFC NETWORK DRIVER
      M:        Solarflare linux maintainers <linux-net-drivers@solarflare.com>
 -----M:        Shradha Shah <sshah@solarflare.com>
 +++++M:        Edward Cree <ecree@solarflare.com>
 +++++M:        Bert Kenward <bkenward@solarflare.com>
      L:        netdev@vger.kernel.org
      S:        Supported
      F:        drivers/net/ethernet/sfc/
@@@@@@@ -10596,14 -10583,6 -10583,6 -10583,6 -10583,6 -10583,6 +10596,14 @@@@@@@ L:     linux-tegra@vger.kernel.or
      S:        Maintained
      F:        drivers/staging/nvec/
      
 +++++STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 +++++M:        Jens Frederich <jfrederich@gmail.com>
 +++++M:        Daniel Drake <dsd@laptop.org>
 +++++M:        Jon Nettleton <jon.nettleton@gmail.com>
 +++++W:        http://wiki.laptop.org/go/DCON
 +++++S:        Maintained
 +++++F:        drivers/staging/olpc_dcon/
 +++++
      STAGING - REALTEK RTL8712U DRIVERS
      M:        Larry Finger <Larry.Finger@lwfinger.net>
      M:        Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
@@@@@@@ -11072,15 -11051,6 -11051,6 -11051,6 -11051,6 -11051,6 +11072,15 @@@@@@@ S:     Maintaine
      F:        drivers/clk/ti/
      F:        include/linux/clk/ti.h
      
 +++++TI ETHERNET SWITCH DRIVER (CPSW)
 +++++M:        Mugunthan V N <mugunthanvnm@ti.com>
 +++++R:        Grygorii Strashko <grygorii.strashko@ti.com>
 +++++L:        linux-omap@vger.kernel.org
 +++++L:        netdev@vger.kernel.org
 +++++S:        Maintained
 +++++F:        drivers/net/ethernet/ti/cpsw*
 +++++F:        drivers/net/ethernet/ti/davinci*
 +++++
      TI FLASH MEDIA INTERFACE DRIVER
      M:        Alex Dubov <oakad@yahoo.com>
      S:        Maintained
@@@@@@@ -11167,8 -11137,8 -11137,8 -11137,8 -11137,8 -11137,8 +11167,8 @@@@@@@ F:       include/uapi/linux/tipc*.
      F:        net/tipc/
      
      TILE ARCHITECTURE
 -----M:        Chris Metcalf <cmetcalf@ezchip.com>
 -----W:        http://www.ezchip.com/scm/
 +++++M:        Chris Metcalf <cmetcalf@mellanox.com>
 +++++W:        http://www.mellanox.com/repository/solutions/tile-scm/
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
      S:        Supported
      F:        arch/tile/
@@@@@@@ -11997,9 -11967,7 -11967,7 -11967,7 -11967,7 -11967,7 +11997,9 @@@@@@@ L:       linux-kernel@vger.kernel.or
      W:        http://www.slimlogic.co.uk/?p=48
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
      S:        Supported
 +++++F:        Documentation/devicetree/bindings/regulator/
      F:        drivers/regulator/
 +++++F:        include/dt-bindings/regulator/
      F:        include/linux/regulator/
      
      VRF
@@@@@@@ -12234,9 -12202,9 -12202,9 -12202,9 -12202,9 -12202,9 +12234,9 @@@@@@@ S:       Maintaine
      F:        drivers/media/tuners/tuner-xc2028.*
      
      XEN HYPERVISOR INTERFACE
 -----M:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      M:        Boris Ostrovsky <boris.ostrovsky@oracle.com>
      M:        David Vrabel <david.vrabel@citrix.com>
 +++++M:        Juergen Gross <jgross@suse.com>
      L:        xen-devel@lists.xenproject.org (moderated for non-subscribers)
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
      S:        Supported
@@@@@@@ -12248,16 -12216,16 -12216,16 -12216,16 -12216,16 -12216,16 +12248,16 @@@@@@@ F:        include/xen
      F:        include/uapi/xen/
      
      XEN HYPERVISOR ARM
 -----M:        Stefano Stabellini <stefano.stabellini@eu.citrix.com>
 +++++M:        Stefano Stabellini <sstabellini@kernel.org>
      L:        xen-devel@lists.xenproject.org (moderated for non-subscribers)
 -----S:        Supported
 +++++S:        Maintained
      F:        arch/arm/xen/
      F:        arch/arm/include/asm/xen/
      
      XEN HYPERVISOR ARM64
 -----M:        Stefano Stabellini <stefano.stabellini@eu.citrix.com>
 +++++M:        Stefano Stabellini <sstabellini@kernel.org>
      L:        xen-devel@lists.xenproject.org (moderated for non-subscribers)
 -----S:        Supported
 +++++S:        Maintained
      F:        arch/arm64/xen/
      F:        arch/arm64/include/asm/xen/
      

diff --combined drivers/regulator/Kconfig
index 4d2d737f8c7ed7904d82864d0228ec020dd3ff30,c77dc08b1202c1077c72e082deadee3f2f9782d5,129359f775d05b42b2d9d7f287e21ec7a150521c,c77dc08b1202c1077c72e082deadee3f2f9782d5,c77dc08b1202c1077c72e082deadee3f2f9782d5,0b616e2192cc072544af4d3ac7b99a77a4fc387a..144cbf5b3e5ad1bf9639d0bda4fc3dd0865b7aa0
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
--- 3/drivers/regulator/Kconfig
--- 4/drivers/regulator/Kconfig
--- 5/drivers/regulator/Kconfig
--- 6/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@@@ -321,15 -321,6 -321,6 -321,6 -321,6 -321,6 +321,15 @@@@@@@ config REGULATOR_LP872
        help
          This driver supports LP8720/LP8725 PMIC
      
 +++++config REGULATOR_LP873X
 +++++  tristate "TI LP873X Power regulators"
 +++++  depends on MFD_LP873X && OF
 +++++  help
 +++++    This driver supports LP873X voltage regulator chips. LP873X
 +++++    provides two step-down converters and two general-purpose LDO
 +++++    voltage regulators. It supports software based voltage control
 +++++    for different voltage domains
 +++++
      config REGULATOR_LP8755
        tristate "TI LP8755 High Performance PMU driver"
        depends on I2C
@@@@@@@ -418,6 -409,6 -409,7 -409,6 -409,6 -409,6 +418,7 @@@@@@@ config REGULATOR_MAX895
      config REGULATOR_MAX8973
        tristate "Maxim MAX8973 voltage regulator "
        depends on I2C
++ +++  depends on THERMAL && THERMAL_OF
        select REGMAP_I2C
        help
          The MAXIM MAX8973 high-efficiency. three phase, DC-DC step-down
@@@@@@@ -557,6 -548,6 -549,6 -548,6 -548,6 -548,13 +558,13 @@@@@@@ config REGULATOR_PV8806
          Say y here to support the voltage regulators and convertors
          PV88060
      
+++++ config REGULATOR_PV88080
+++++   tristate "Powerventure Semiconductor PV88080 regulator"
+++++   depends on I2C
+++++   select REGMAP_I2C
+++++   help
+++++     Say y here to support the buck convertors on PV88080
+++++ 
      config REGULATOR_PV88090
        tristate "Powerventure Semiconductor PV88090 regulator"
        depends on I2C

diff --combined drivers/regulator/Makefile
index 7182b5f7c3e7cffc08edf2dbb1e79d8cb93dfb96,61bfbb9d4a0c9fe8724fb0a0aad0cafd7d08176c,61bfbb9d4a0c9fe8724fb0a0aad0cafd7d08176c,8018b2ef13cbbd27ee7bed90426c2f218a61794c,61bfbb9d4a0c9fe8724fb0a0aad0cafd7d08176c,2f6f9f862aeaa696fe4cc19daa48a73ee90f6fec..85a1d44a393968cfe52597753f12310d17a4d7e9
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
--- 3/drivers/regulator/Makefile
--- 4/drivers/regulator/Makefile
--- 5/drivers/regulator/Makefile
--- 6/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@@@ -42,12 -42,11 -42,11 -42,11 -42,11 -42,11 +42,12 @@@@@@@ obj-$(CONFIG_REGULATOR_LM363X) += lm363
      obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
      obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o
      obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o
 +++++obj-$(CONFIG_REGULATOR_LP873X) += lp873x-regulator.o
      obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o
      obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o
      obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o
      obj-$(CONFIG_REGULATOR_LTC3589) += ltc3589.o
--- --obj-$(CONFIG_REGULATOR_MAX14577) += max14577.o
+++ ++obj-$(CONFIG_REGULATOR_MAX14577) += max14577-regulator.o
      obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o
      obj-$(CONFIG_REGULATOR_MAX77620) += max77620-regulator.o
      obj-$(CONFIG_REGULATOR_MAX8649)   += max8649.o
@@@@@@@ -56,10 -55,10 -55,10 -55,10 -55,10 -55,10 +56,10 @@@@@@@ obj-$(CONFIG_REGULATOR_MAX8907) += max8
      obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o
      obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o
      obj-$(CONFIG_REGULATOR_MAX8973) += max8973-regulator.o
--- --obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o
+++ ++obj-$(CONFIG_REGULATOR_MAX8997) += max8997-regulator.o
      obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
      obj-$(CONFIG_REGULATOR_MAX77686) += max77686-regulator.o
--- --obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o
+++ ++obj-$(CONFIG_REGULATOR_MAX77693) += max77693-regulator.o
      obj-$(CONFIG_REGULATOR_MAX77802) += max77802-regulator.o
      obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
      obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
@@@@@@@ -72,6 -71,6 -71,6 -71,6 -71,6 -71,7 +72,7 @@@@@@@ obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qc
      obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
      obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
      obj-$(CONFIG_REGULATOR_PV88060) += pv88060-regulator.o
+++++ obj-$(CONFIG_REGULATOR_PV88080) += pv88080-regulator.o
      obj-$(CONFIG_REGULATOR_PV88090) += pv88090-regulator.o
      obj-$(CONFIG_REGULATOR_PWM) += pwm-regulator.o
      obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o