Merge tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd

Pull MTD fixes from Brian Norris:
 "Two trivial updates.  I meant to send these much earlier, but I've
  been preoccupied.

   - Add MAINTAINERS entry for diskonchip g3 driver

   - Fix an overlooked conflict in bitfield value assignments

  The latter update is a bit overdue, but there's no reason to wait any
  longer"

* tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd:
  mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
  MAINTAINERS: mtd: docg3: add docg3 maintainer

diff --combined MAINTAINERS
index 2eb627252239f6d71590636ab0068fe42d87f311,9567329637408ec5452b1ff965f4b4e6dbe797d0..9289ecb57b68d17b612cdc3eb932627b6ac426d7
--- 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
@@@ -4052,7 -4038,7 +4052,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
@@@ -4060,7 -4046,7 +4060,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
@@@ -4110,7 -4096,7 +4110,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
@@@ -4245,7 -4231,7 +4245,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
@@@ -4666,7 -4652,7 +4666,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
@@@ -4713,7 -4699,7 +4713,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/
@@@ -4816,7 -4802,7 +4816,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
@@@ -4825,7 -4811,7 +4825,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
@@@ -4959,7 -4945,7 +4959,7 @@@ F:      include/linux/hyperv.
  F:    tools/hv/
  
  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
@@@ -4968,7 -4954,7 +4968,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
@@@ -5009,7 -4995,7 +5009,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
@@@ -5036,7 -5022,7 +5036,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
@@@ -5565,8 -5551,8 +5565,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/
  
@@@ -5686,7 -5672,7 +5686,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
@@@ -5753,7 -5739,7 +5753,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/
@@@ -5817,7 -5803,7 +5817,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
@@@ -5881,7 -5867,7 +5881,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
@@@ -5899,6 -5885,7 +5899,6 @@@ S:      Supporte
  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>
@@@ -6037,7 -6024,7 +6037,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
@@@ -6090,7 -6077,7 +6090,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
@@@ -6160,7 -6147,6 +6160,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>
@@@ -6175,7 -6161,7 +6175,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/
@@@ -6251,8 -6237,8 +6251,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
@@@ -6278,21 -6264,21 +6278,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
@@@ -6838,6 -6824,12 +6838,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
@@@ -7019,7 -7011,6 +7025,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>
@@@ -7719,7 -7710,7 +7725,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
@@@ -7996,7 -7987,7 +8002,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
@@@ -8004,7 -7995,7 +8010,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
@@@ -8381,12 -8372,10 +8387,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
  
@@@ -8895,7 -8884,7 +8901,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
@@@ -9062,7 -9051,7 +9068,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
@@@ -9424,7 -9413,7 +9430,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
@@@ -9473,7 -9462,7 +9479,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/
@@@ -9516,7 -9505,7 +9522,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
@@@ -9600,7 -9589,7 +9606,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)
@@@ -9609,7 -9598,7 +9615,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
@@@ -10399,7 -10388,7 +10405,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/
@@@ -10473,7 -10462,7 +10479,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/
@@@ -10616,7 -10605,7 +10622,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
@@@ -10741,7 -10730,7 +10747,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
@@@ -10895,15 -10884,6 +10901,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>
@@@ -11077,7 -11057,7 +11083,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