Merge 3.19-rc5 into char-misc-next

We want the 3.19-rc5 fixes in here for our testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --combined MAINTAINERS
index 2b41cd183b4f225cf0f9b8fdf9b3464bc3308ab0,2fa38532124537dec0a9d9e019471b628be6f58c..b00535f1e74c415ed998d46bf1b74a62302e2e3c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -724,15 -724,15 +724,15 @@@ F:      include/uapi/linux/apm_bios.
  F:    drivers/char/apm-emulation.c
  
  APPLE BCM5974 MULTITOUCH DRIVER
- M:    Henrik Rydberg <rydberg@euromail.se>
+ M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    linux-input@vger.kernel.org
- S:    Maintained
+ S:    Odd fixes
  F:    drivers/input/mouse/bcm5974.c
  
  APPLE SMC DRIVER
- M:    Henrik Rydberg <rydberg@euromail.se>
+ M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    lm-sensors@lm-sensors.org
- S:    Maintained
+ S:    Odd fixes
  F:    drivers/hwmon/applesmc.c
  
  APPLETALK NETWORK LAYER
@@@ -2259,6 -2259,7 +2259,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>
  L:    linux-btrfs@vger.kernel.org
  W:    http://btrfs.wiki.kernel.org/
  Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
@@@ -3012,7 -3013,6 +3013,7 @@@ F:      drivers/platform/x86/dell-laptop.
  
  DELL LAPTOP SMM DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
 +S:    Maintained
  F:    drivers/char/i8k.c
  F:    include/uapi/linux/i8k.h
  
@@@ -3183,7 -3183,7 +3184,7 @@@ L:      dmaengine@vger.kernel.or
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Maintained
  F:    drivers/dma/
- F:    include/linux/dma*
+ F:    include/linux/dmaengine.h
  F:    Documentation/dmaengine/
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git
  
@@@ -4749,7 -4749,7 +4750,7 @@@ S:      Supporte
  F:    drivers/scsi/ipr.*
  
  IBM Power Virtual Ethernet Device Driver
- M:    Santiago Leon <santil@linux.vnet.ibm.com>
+ M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
@@@ -4941,10 -4941,10 +4942,10 @@@ F:   include/uapi/linux/input.
  F:    include/linux/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
- M:    Henrik Rydberg <rydberg@euromail.se>
+ M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    linux-input@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
- S:    Maintained
+ S:    Odd fixes
  F:    Documentation/input/multi-touch-protocol.txt
  F:    drivers/input/input-mt.c
  K:    \b(ABS|SYN)_MT_
@@@ -5280,6 -5280,15 +5281,15 @@@ W:    www.open-iscsi.or
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/ulp/iser/
  
+ ISCSI EXTENSIONS FOR RDMA (ISER) TARGET
+ M:    Sagi Grimberg <sagig@mellanox.com>
+ 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
+ S:    Supported
+ W:    http://www.linux-iscsi.org
+ F:    drivers/infiniband/ulp/isert
+ 
  ISDN SUBSYSTEM
  M:    Karsten Keil <isdn@linux-pingi.de>
  L:    isdn4linux@listserv.isdn4linux.de (subscribers-only)
@@@ -7738,8 -7747,7 +7748,7 @@@ F:      Documentation/scsi/LICENSE.qla2xx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA4XXX iSCSI DRIVER
- M:    Vikas Chaudhary <vikas.chaudhary@qlogic.com>
- M:    iscsi-driver@qlogic.com
+ M:    QLogic-Storage-Upstream@qlogic.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    Documentation/scsi/LICENSE.qla4xxx
@@@ -9534,7 -9542,8 +9543,8 @@@ F:      drivers/platform/x86/thinkpad_acpi.
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-pm@vger.kernel.org
- S:    Supported
+ L:    linux-omap@vger.kernel.org
+ S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
  TI CLOCK DRIVER