Merge tag 'for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

Pull power supply and reset changes from Sebastian Reichel:
 - new reset driver for ZTE SoCs
 - add support for sama5d3 reset handling
 - overhaul of twl4030 charger driver
 - misc fixes and cleanups

* tag 'for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (35 commits)
  bq2415x_charger: Allow to load and use driver even if notify device is not registered yet
  twl4030_charger: fix compile error when TWL4030_MADC not available.
  power: bq24190_charger: Fix charge type sysfs property
  power: Allow compile test of GPIO consumers if !GPIOLIB
  power: Export I2C module alias information in missing drivers
  twl4030_charger: Increase current carefully while watching voltage.
  twl4030_charger: add ac/mode to match usb/mode
  twl4030_charger: add software controlled linear charging mode.
  twl4030_charger: enable manual enable/disable of usb charging.
  twl4030_charger: allow max_current to be managed via sysfs.
  twl4030_charger: distinguish between USB current and 'AC' current
  twl4030_charger: allow fine control of charger current.
  twl4030_charger: split uA calculation into a function.
  twl4030_charger: trust phy to determine when USB power is available.
  twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node
  twl4030_charger: convert to module_platform_driver instead of ..._probe.
  twl4030_charger: use runtime_pm to keep usb phy active while charging.
  rx51-battery: Set name to rx51-battery
  MAINTAINERS: AVS is not maintained via power supply tree
  power: olpc_battery: clean up eeprom read function
  ...

diff --combined MAINTAINERS
index 8b3115cd762e9438440bf83f48ddd9e2a517c1af,243f76f4fc07969a86a2ab732130dbb46875002f..d53955790f7e059ddadad0d040630fcb6586082d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -361,11 -361,11 +361,11 @@@ S:      Supporte
  F:    drivers/input/touchscreen/ad7879.c
  
  ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)
 -M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Jiri Kosina <jkosina@suse.com>
  S:    Maintained
  
  ADM1025 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/adm1025
@@@ -430,7 -430,7 +430,7 @@@ S: Maintaine
  F:    drivers/macintosh/therm_adt746x.c
  
  ADT7475 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/adt7475
@@@ -445,7 -445,7 +445,7 @@@ F: drivers/input/misc/adxl34x.
  
  ADVANSYS SCSI DRIVER
  M:    Matthew Wilcox <matthew@wil.cx>
 -M:    Hannes Reinecke <hare@suse.de>
 +M:    Hannes Reinecke <hare@suse.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    Documentation/scsi/advansys.txt
@@@ -506,7 -506,7 +506,7 @@@ F: drivers/scsi/aha152x
  F:    drivers/scsi/pcmcia/aha152x*
  
  AIC7XXX / AIC79XX SCSI DRIVER
 -M:    Hannes Reinecke <hare@suse.de>
 +M:    Hannes Reinecke <hare@suse.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/aic7xxx/
@@@ -746,7 -746,7 +746,7 @@@ S: Maintaine
  F:    sound/aoa/
  
  APM DRIVER
 -M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Jiri Kosina <jkosina@suse.com>
  S:    Odd fixes
  F:    arch/x86/kernel/apm_32.c
  F:    include/linux/apm_bios.h
@@@ -1001,7 -1001,6 +1001,7 @@@ ARM/CONEXANT DIGICOLOR MACHINE SUPPOR
  M:    Baruch Siach <baruch@tkos.co.il>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    arch/arm/boot/dts/cx92755*
  N:    digicolor
  
  ARM/EBSA110 MACHINE SUPPORT
@@@ -1325,7 -1324,7 +1325,7 @@@ F:      arch/arm/mach-pxa/include/mach/palmt
  F:    arch/arm/mach-pxa/palmtc.c
  
  ARM/PALM TREO SUPPORT
 -M:    Tomas Cech <sleep_walker@suse.cz>
 +M:    Tomas Cech <sleep_walker@suse.com>
  L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
@@@ -1615,7 -1614,6 +1615,7 @@@ M:      Lorenzo Pieralisi <lorenzo.pieralisi
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/vexpress*
 +F:    arch/arm64/boot/dts/arm/vexpress*
  F:    arch/arm/mach-vexpress/
  F:    */*/vexpress*
  F:    */*/*/vexpress*
@@@ -2406,7 -2404,7 +2406,7 @@@ F:      drivers/gpio/gpio-bt8xx.
  BTRFS FILE SYSTEM
  M:    Chris Mason <clm@fb.com>
  M:    Josef Bacik <jbacik@fb.com>
 -M:    David Sterba <dsterba@suse.cz>
 +M:    David Sterba <dsterba@suse.com>
  L:    linux-btrfs@vger.kernel.org
  W:    http://btrfs.wiki.kernel.org/
  Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
@@@ -2564,31 -2562,19 +2564,31 @@@ F:   arch/powerpc/include/uapi/asm/spu*.
  F:    arch/powerpc/oprofile/*cell*
  F:    arch/powerpc/platforms/cell/
  
 -CEPH DISTRIBUTED FILE SYSTEM CLIENT
 +CEPH COMMON CODE (LIBCEPH)
 +M:    Ilya Dryomov <idryomov@gmail.com>
  M:    "Yan, Zheng" <zyan@redhat.com>
  M:    Sage Weil <sage@redhat.com>
  L:    ceph-devel@vger.kernel.org
  W:    http://ceph.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 +T:    git git://github.com/ceph/ceph-client.git
  S:    Supported
 -F:    Documentation/filesystems/ceph.txt
 -F:    fs/ceph/
  F:    net/ceph/
  F:    include/linux/ceph/
  F:    include/linux/crush/
  
 +CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
 +M:    "Yan, Zheng" <zyan@redhat.com>
 +M:    Sage Weil <sage@redhat.com>
 +M:    Ilya Dryomov <idryomov@gmail.com>
 +L:    ceph-devel@vger.kernel.org
 +W:    http://ceph.com/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 +T:    git git://github.com/ceph/ceph-client.git
 +S:    Supported
 +F:    Documentation/filesystems/ceph.txt
 +F:    fs/ceph/
 +
  CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
  L:    linux-usb@vger.kernel.org
  S:    Orphan
@@@ -2749,7 -2735,7 +2749,7 @@@ COCCINELLE/Semantic Patches (SmPL
  M:    Julia Lawall <Julia.Lawall@lip6.fr>
  M:    Gilles Muller <Gilles.Muller@lip6.fr>
  M:    Nicolas Palix <nicolas.palix@imag.fr>
 -M:    Michal Marek <mmarek@suse.cz>
 +M:    Michal Marek <mmarek@suse.com>
  L:    cocci@systeme.lip6.fr (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc
  W:    http://coccinelle.lip6.fr/
@@@ -2865,7 -2851,7 +2865,7 @@@ F:      kernel/cpuset.
  
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <hannes@cmpxchg.org>
 -M:    Michal Hocko <mhocko@suse.cz>
 +M:    Michal Hocko <mhocko@kernel.org>
  L:    cgroups@vger.kernel.org
  L:    linux-mm@kvack.org
  S:    Maintained
@@@ -2946,7 -2932,7 +2946,7 @@@ F:      arch/x86/kernel/cpuid.
  F:    arch/x86/kernel/msr.c
  
  CPU POWER MONITORING SUBSYSTEM
 -M:    Thomas Renninger <trenn@suse.de>
 +M:    Thomas Renninger <trenn@suse.com>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  F:    tools/power/cpupower/
@@@ -3176,7 -3162,7 +3176,7 @@@ F:      Documentation/networking/dmfe.tx
  F:    drivers/net/ethernet/dec/tulip/dmfe.c
  
  DC390/AM53C974 SCSI driver
 -M:    Hannes Reinecke <hare@suse.de>
 +M:    Hannes Reinecke <hare@suse.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/am53c974.c
@@@ -3380,7 -3366,7 +3380,7 @@@ W:      http://www.win.tue.nl/~aeb/partition
  S:    Maintained
  
  DISKQUOTA
 -M:    Jan Kara <jack@suse.cz>
 +M:    Jan Kara <jack@suse.com>
  S:    Maintained
  F:    Documentation/filesystems/quota.txt
  F:    fs/quota/
@@@ -3436,7 -3422,7 +3436,7 @@@ F:      Documentation/hwmon/dme173
  F:    drivers/hwmon/dme1737.c
  
  DMI/SMBIOS SUPPORT
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  S:    Maintained
  T:    quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/
  F:    Documentation/ABI/testing/sysfs-firmware-dmi-tables
@@@ -3587,15 -3573,6 +3587,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/rockchip/
  F:    Documentation/devicetree/bindings/video/rockchip*
  
 +DRM DRIVERS FOR STI
 +M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 +M:    Vincent Abriou <vincent.abriou@st.com>
 +L:    dri-devel@lists.freedesktop.org
 +T:    git http://git.linaro.org/people/benjamin.gaignard/kernel.git
 +S:    Maintained
 +F:    drivers/gpu/drm/sti
 +F:    Documentation/devicetree/bindings/gpu/st,stih4xx.txt
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <klimov.linux@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -4061,7 -4038,7 +4061,7 @@@ F:      drivers/of/of_mdio.
  F:    drivers/of/of_net.c
  
  EXT2 FILE SYSTEM
 -M:    Jan Kara <jack@suse.cz>
 +M:    Jan Kara <jack@suse.com>
  L:    linux-ext4@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/ext2.txt
@@@ -4069,7 -4046,7 +4069,7 @@@ F:      fs/ext2
  F:    include/linux/ext2*
  
  EXT3 FILE SYSTEM
 -M:    Jan Kara <jack@suse.cz>
 +M:    Jan Kara <jack@suse.com>
  M:    Andrew Morton <akpm@linux-foundation.org>
  M:    Andreas Dilger <adilger.kernel@dilger.ca>
  L:    linux-ext4@vger.kernel.org
@@@ -4119,7 -4096,7 +4119,7 @@@ F:      drivers/video/fbdev/exynos/exynos_mi
  F:    include/video/exynos_mipi*
  
  F71805F HARDWARE MONITORING DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/f71805f
@@@ -4254,7 -4231,7 +4254,7 @@@ S:      Maintaine
  F:    drivers/block/rsxx/
  
  FLOPPY DRIVER
 -M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Jiri Kosina <jkosina@suse.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
  S:    Odd fixes
  F:    drivers/block/floppy.c
@@@ -4675,7 -4652,7 +4675,7 @@@ F:      drivers/media/usb/stk1160
  
  H8/300 ARCHITECTURE
  M:    Yoshinori Sato <ysato@users.sourceforge.jp>
 -L:    uclinux-h8-devel@lists.sourceforge.jp
 +L:    uclinux-h8-devel@lists.sourceforge.jp (moderated for non-subscribers)
  W:    http://uclinux-h8.sourceforge.jp
  T:    git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git
  S:    Maintained
@@@ -4722,7 -4699,7 +4722,7 @@@ S:      Maintaine
  F:    drivers/media/usb/hackrf/
  
  HARDWARE MONITORING
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
@@@ -4825,7 -4802,7 +4825,7 @@@ F:      include/linux/pm.
  F:    arch/*/include/asm/suspend*.h
  
  HID CORE LAYER
 -M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Jiri Kosina <jkosina@suse.com>
  L:    linux-input@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -4834,7 -4811,7 +4834,7 @@@ F:      include/linux/hid
  F:    include/uapi/linux/hid*
  
  HID SENSOR HUB DRIVERS
 -M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Jiri Kosina <jkosina@suse.com>
  M:    Jonathan Cameron <jic23@kernel.org>
  M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
  L:    linux-input@vger.kernel.org
@@@ -4966,10 -4943,9 +4966,10 @@@ F:    drivers/scsi/storvsc_drv.
  F:    drivers/video/fbdev/hyperv_fb.c
  F:    include/linux/hyperv.h
  F:    tools/hv/
 +F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
  I2C OVER PARALLEL PORT
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    Documentation/i2c/busses/i2c-parport
@@@ -4978,7 -4954,7 +4978,7 @@@ F:      drivers/i2c/busses/i2c-parport.
  F:    drivers/i2c/busses/i2c-parport-light.c
  
  I2C/SMBUS CONTROLLER DRIVERS FOR PC
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    Documentation/i2c/busses/i2c-ali1535
@@@ -5019,7 -4995,7 +5019,7 @@@ F:      drivers/i2c/busses/i2c-ismt.
  F:    Documentation/i2c/busses/i2c-ismt
  
  I2C/SMBUS STUB DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/i2c/i2c-stub.c
@@@ -5046,7 -5022,7 +5046,7 @@@ L:      linux-acpi@vger.kernel.or
  S:    Maintained
  
  I2C-TAOS-EVM DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    Documentation/i2c/busses/i2c-taos-evm
@@@ -5575,8 -5551,8 +5575,8 @@@ F:      include/uapi/linux/ip_vs.
  F:    net/netfilter/ipvs/
  
  IPWIRELESS DRIVER
 -M:    Jiri Kosina <jkosina@suse.cz>
 -M:    David Sterba <dsterba@suse.cz>
 +M:    Jiri Kosina <jkosina@suse.com>
 +M:    David Sterba <dsterba@suse.com>
  S:    Odd Fixes
  F:    drivers/tty/ipwireless/
  
@@@ -5610,7 -5586,6 +5610,7 @@@ F:      kernel/irq
  IRQCHIP DRIVERS
  M:    Thomas Gleixner <tglx@linutronix.de>
  M:    Jason Cooper <jason@lakedaemon.net>
 +M:    Marc Zyngier <marc.zyngier@arm.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@@ -5619,14 -5594,11 +5619,14 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/irqchip/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 -M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
 +M:    Jiang Liu <jiang.liu@linux.intel.com>
 +M:    Marc Zyngier <marc.zyngier@arm.com>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    Documentation/IRQ-domain.txt
  F:    include/linux/irqdomain.h
  F:    kernel/irq/irqdomain.c
 +F:    kernel/irq/msi.c
  
  ISAPNP
  M:    Jaroslav Kysela <perex@perex.cz>
@@@ -5700,7 -5672,7 +5700,7 @@@ S:      Maintaine
  F:    drivers/isdn/hardware/eicon/
  
  IT87 HARDWARE MONITORING DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/it87
@@@ -5767,7 -5739,7 +5767,7 @@@ F:      include/uapi/linux/jffs2.
  
  JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
  M:    Andrew Morton <akpm@linux-foundation.org>
 -M:    Jan Kara <jack@suse.cz>
 +M:    Jan Kara <jack@suse.com>
  L:    linux-ext4@vger.kernel.org
  S:    Maintained
  F:    fs/jbd/
@@@ -5831,7 -5803,7 +5831,7 @@@ S:      Maintaine
  F:    fs/autofs4/
  
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 -M:    Michal Marek <mmarek@suse.cz>
 +M:    Michal Marek <mmarek@suse.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git for-next
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes
  L:    linux-kbuild@vger.kernel.org
@@@ -5850,7 -5822,6 +5850,7 @@@ S:      Odd Fixe
  
  KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
  M:    "J. Bruce Fields" <bfields@fieldses.org>
 +M:    Jeff Layton <jlayton@poochiereds.net>
  L:    linux-nfs@vger.kernel.org
  W:    http://nfs.sourceforge.net/
  S:    Supported
@@@ -5896,7 -5867,7 +5896,7 @@@ F:      arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 -M:    Alexander Graf <agraf@suse.de>
 +M:    Alexander Graf <agraf@suse.com>
  L:    kvm-ppc@vger.kernel.org
  W:    http://kvm.qumranet.com
  T:    git git://github.com/agraf/linux-2.6.git
@@@ -5907,12 -5878,14 +5907,12 @@@ F:   arch/powerpc/kvm
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <borntraeger@de.ibm.com>
  M:    Cornelia Huck <cornelia.huck@de.ibm.com>
 -M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    Documentation/s390/kvm.txt
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/kvm/
 -F:    drivers/s390/kvm/
  
  KERNEL VIRTUAL MACHINE (KVM) FOR ARM
  M:    Christoffer Dall <christoffer.dall@linaro.org>
@@@ -6051,7 -6024,7 +6051,7 @@@ F:      drivers/leds
  F:    include/linux/leds.h
  
  LEGACY EEPROM DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  S:    Maintained
  F:    Documentation/misc-devices/eeprom
  F:    drivers/misc/eeprom/eeprom.c
@@@ -6104,7 -6077,7 +6104,7 @@@ F:      include/linux/ata.
  F:    include/linux/libata.h
  
  LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
 -M:    Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <vireshk@kernel.org>
  L:    linux-ide@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
  S:    Maintained
@@@ -6174,7 -6147,6 +6174,7 @@@ L:      linux-nvdimm@lists.01.or
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
  F:    drivers/nvdimm/pmem.c
 +F:    include/linux/pmem.h
  
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <paulus@au.ibm.com>
@@@ -6189,7 -6161,7 +6189,7 @@@ M:      Michael Ellerman <mpe@ellerman.id.au
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
  Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
  S:    Supported
  F:    Documentation/powerpc/
  F:    arch/powerpc/
@@@ -6265,8 -6237,8 +6265,8 @@@ F:      drivers/platform/x86/hp_accel.
  LIVE PATCHING
  M:    Josh Poimboeuf <jpoimboe@redhat.com>
  M:    Seth Jennings <sjenning@redhat.com>
 -M:    Jiri Kosina <jkosina@suse.cz>
 -M:    Vojtech Pavlik <vojtech@suse.cz>
 +M:    Jiri Kosina <jkosina@suse.com>
 +M:    Vojtech Pavlik <vojtech@suse.com>
  S:    Maintained
  F:    kernel/livepatch/
  F:    include/linux/livepatch.h
@@@ -6292,21 -6264,21 +6292,21 @@@ S:   Maintaine
  F:    drivers/hwmon/lm73.c
  
  LM78 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/lm78
  F:    drivers/hwmon/lm78.c
  
  LM83 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/lm83
  F:    drivers/hwmon/lm83.c
  
  LM90 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/lm90
@@@ -6852,12 -6824,6 +6852,12 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/usb/msi2500/
  
 +MSYSTEMS DISKONCHIP G3 MTD DRIVER
 +M:    Robert Jarzmik <robert.jarzmik@free.fr>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/devices/docg3*
 +
  MT9M032 APTINA SENSOR DRIVER
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -7039,7 -7005,6 +7039,7 @@@ F:      include/uapi/linux/netfilter
  F:    net/*/netfilter.c
  F:    net/*/netfilter/
  F:    net/netfilter/
 +F:    net/bridge/br_netfilter*.c
  
  NETLABEL
  M:    Paul Moore <paul@paul-moore.com>
@@@ -7298,15 -7263,6 +7298,15 @@@ S:    Supporte
  F:    drivers/block/nvme*
  F:    include/linux/nvme.h
  
 +NVMEM FRAMEWORK
 +M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 +M:    Maxime Ripard <maxime.ripard@free-electrons.com>
 +S:    Maintained
 +F:    drivers/nvmem/
 +F:    Documentation/devicetree/bindings/nvmem/
 +F:    include/linux/nvmem-consumer.h
 +F:    include/linux/nvmem-provider.h
 +
  NXP-NCI NFC DRIVER
  M:    Clément Perrochaud <clement.perrochaud@effinnov.com>
  R:    Charles Gorand <charles.gorand@effinnov.com>
@@@ -7748,7 -7704,7 +7748,7 @@@ S:      Maintaine
  F:    drivers/char/pc8736x_gpio.c
  
  PC87427 HARDWARE MONITORING DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/pc87427
@@@ -8025,7 -7981,7 +8025,7 @@@ S:      Maintaine
  F:    drivers/pinctrl/samsung/
  
  PIN CONTROLLER - ST SPEAR
 -M:    Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <vireshk@kernel.org>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
@@@ -8033,7 -7989,7 +8033,7 @@@ S:      Maintaine
  F:    drivers/pinctrl/spear/
  
  PKTCDVD DRIVER
 -M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Jiri Kosina <jkosina@suse.com>
  S:    Maintained
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
@@@ -8093,6 -8049,7 +8093,7 @@@ T:      git git://git.infradead.org/battery-
  S:    Maintained
  F:    include/linux/power_supply.h
  F:    drivers/power/
+ X:    drivers/power/avs/
  
  PNP SUPPORT
  M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
@@@ -8410,12 -8367,10 +8411,12 @@@ RADOS BLOCK DEVICE (RBD
  M:    Ilya Dryomov <idryomov@gmail.com>
  M:    Sage Weil <sage@redhat.com>
  M:    Alex Elder <elder@kernel.org>
 -M:    ceph-devel@vger.kernel.org
 +L:    ceph-devel@vger.kernel.org
  W:    http://ceph.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 +T:    git git://github.com/ceph/ceph-client.git
  S:    Supported
 +F:    Documentation/ABI/testing/sysfs-bus-rbd
  F:    drivers/block/rbd.c
  F:    drivers/block/rbd_types.h
  
@@@ -8717,6 -8672,7 +8718,6 @@@ F:      drivers/video/fbdev/savage
  S390
  M:    Martin Schwidefsky <schwidefsky@de.ibm.com>
  M:    Heiko Carstens <heiko.carstens@de.ibm.com>
 -M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -8744,6 -8700,7 +8745,6 @@@ F:      block/partitions/ibm.
  
  S390 NETWORK DRIVERS
  M:    Ursula Braun <ursula.braun@de.ibm.com>
 -M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -8760,6 -8717,7 +8761,6 @@@ F:      drivers/pci/hotplug/s390_pci_hpc.
  
  S390 ZCRYPT DRIVER
  M:    Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
 -M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -8767,6 -8725,7 +8768,6 @@@ F:      drivers/s390/crypto
  
  S390 ZFCP DRIVER
  M:    Steffen Maier <maier@linux.vnet.ibm.com>
 -M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -8774,6 -8733,7 +8775,6 @@@ F:      drivers/s390/scsi/zfcp_
  
  S390 IUCV NETWORK LAYER
  M:    Ursula Braun <ursula.braun@de.ibm.com>
 -M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -8919,7 -8879,7 +8920,7 @@@ S:      Maintaine
  F:    drivers/tty/serial/
  
  SYNOPSYS DESIGNWARE DMAC DRIVER
 -M:    Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <vireshk@kernel.org>
  M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  S:    Maintained
  F:    include/linux/dma/dw.h
@@@ -9086,7 -9046,7 +9087,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/sdhci-s3c*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
 -M:    Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <vireshk@kernel.org>
  L:    spear-devel@list.st.com
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
@@@ -9342,15 -9302,6 +9343,15 @@@ S:    Maintaine
  F:    drivers/media/i2c/ov2659.c
  F:    include/media/ov2659.h
  
 +SILICON MOTION SM712 FRAME BUFFER DRIVER
 +M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 +M:    Teddy Wang <teddy.wang@siliconmotion.com>
 +M:    Sudip Mukherjee <sudip@vectorindia.org>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/fbdev/sm712*
 +F:    Documentation/fb/sm712fb.txt
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -9457,7 -9408,7 +9458,7 @@@ F:      Documentation/hwmon/sch562
  F:    drivers/hwmon/sch5627.c
  
  SMSC47B397 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/smsc47b397
@@@ -9506,7 -9457,7 +9507,7 @@@ S:      Supporte
  F:    drivers/media/pci/solo6x10/
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
 -M:    Neil Brown <neilb@suse.de>
 +M:    Neil Brown <neilb@suse.com>
  L:    linux-raid@vger.kernel.org
  S:    Supported
  F:    drivers/md/
@@@ -9549,7 -9500,7 +9550,7 @@@ F:      drivers/memstick/core/ms_block.
  
  SOUND
  M:    Jaroslav Kysela <perex@perex.cz>
 -M:    Takashi Iwai <tiwai@suse.de>
 +M:    Takashi Iwai <tiwai@suse.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://www.alsa-project.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
@@@ -9633,7 -9584,7 +9634,7 @@@ S:      Maintaine
  F:    include/linux/compiler.h
  
  SPEAR PLATFORM SUPPORT
 -M:    Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <vireshk@kernel.org>
  M:    Shiraz Hashim <shiraz.linux.kernel@gmail.com>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -9642,7 -9593,7 +9643,7 @@@ S:      Maintaine
  F:    arch/arm/mach-spear/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
 -M:    Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <vireshk@kernel.org>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
@@@ -9748,6 -9699,11 +9749,6 @@@ W:     http://wiki.laptop.org/go/DCO
  S:    Maintained
  F:    drivers/staging/olpc_dcon/
  
 -STAGING - OZMO DEVICES USB OVER WIFI DRIVER
 -M:    Shigekatsu Tateno <shigekatsu.tateno@atmel.com>
 -S:    Maintained
 -F:    drivers/staging/ozwpan/
 -
  STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
  M:    Willy Tarreau <willy@meta-x.org>
  S:    Odd Fixes
@@@ -9766,6 -9722,14 +9767,6 @@@ L:     linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/staging/rtl8723au/
  
 -STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
 -M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 -M:    Teddy Wang <teddy.wang@siliconmotion.com>
 -M:    Sudip Mukherjee <sudip@vectorindia.org>
 -L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/staging/sm7xxfb/
 -
  STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
  M:    Teddy Wang <teddy.wang@siliconmotion.com>
@@@ -10419,7 -10383,7 +10420,7 @@@ K:   ^Subject:.*(?i)trivia
  
  TTY LAYER
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -M:    Jiri Slaby <jslaby@suse.cz>
 +M:    Jiri Slaby <jslaby@suse.com>
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
  F:    Documentation/serial/
@@@ -10493,7 -10457,7 +10494,7 @@@ F:   arch/m68k/*/*_no.
  F:    arch/m68k/include/asm/*_no.*
  
  UDF FILESYSTEM
 -M:    Jan Kara <jack@suse.cz>
 +M:    Jan Kara <jack@suse.com>
  S:    Maintained
  F:    Documentation/filesystems/udf.txt
  F:    fs/udf/
@@@ -10636,7 -10600,7 +10637,7 @@@ F:   drivers/usb/gadget
  F:    include/linux/usb/gadget*
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
 -M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Jiri Kosina <jkosina@suse.com>
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -10761,7 -10725,7 +10762,7 @@@ S:   Maintaine
  F:    drivers/usb/host/uhci*
  
  USB "USBNET" DRIVER FRAMEWORK
 -M:    Oliver Neukum <oneukum@suse.de>
 +M:    Oliver Neukum <oneukum@suse.com>
  L:    netdev@vger.kernel.org
  W:    http://www.linux-usb.org/usbnet
  S:    Maintained
@@@ -10915,15 -10879,6 +10916,15 @@@ F: drivers/block/virtio_blk.
  F:    include/linux/virtio_*.h
  F:    include/uapi/linux/virtio_*.h
  
 +VIRTIO DRIVERS FOR S390
 +M:    Christian Borntraeger <borntraeger@de.ibm.com>
 +M:    Cornelia Huck <cornelia.huck@de.ibm.com>
 +L:    linux-s390@vger.kernel.org
 +L:    virtualization@lists.linux-foundation.org
 +L:    kvm@vger.kernel.org
 +S:    Supported
 +F:    drivers/s390/virtio/
 +
  VIRTIO GPU DRIVER
  M:    David Airlie <airlied@linux.ie>
  M:    Gerd Hoffmann <kraxel@redhat.com>
@@@ -11097,7 -11052,7 +11098,7 @@@ F:   Documentation/hwmon/w8379
  F:    drivers/hwmon/w83793.c
  
  W83795 HARDWARE MONITORING DRIVER
 -M:    Jean Delvare <jdelvare@suse.de>
 +M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    drivers/hwmon/w83795.c