Merge remote-tracking branches 'spi/fix/lock', 'spi/fix/maintainers', 'spi/fix/put...

diff --cc MAINTAINERS
index db814a89599ce8141cc5b92603623946d5bee325,20bb1d00098c70dacad7a9c778087f9319b0c5c6,5051c2f46d47b18dbf445e13b4740741a49f20d9,7aa632f461dcdf38d28631370cd10e8217f66026,20bb1d00098c70dacad7a9c778087f9319b0c5c6,7aa632f461dcdf38d28631370cd10e8217f66026,20bb1d00098c70dacad7a9c778087f9319b0c5c6..1fbd77d2de77510bd28bc1aac744b71f5d327fd8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
--- 7/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@@ -1638,13 -1627,13 -1627,12 -1603,12 -1627,13 -1603,12 -1627,13 +1638,12 @@@@@@@@ F:    arch/arm/mach-s3c24*
       F:       arch/arm/mach-s3c64xx/
       F:       arch/arm/mach-s5p*/
       F:       arch/arm/mach-exynos*/
   - - F:       drivers/*/*s3c2410*
   - - F:       drivers/*/*/*s3c2410*
   + + F:       drivers/*/*s3c24*
   + + F:       drivers/*/*/*s3c24*
   + + F:       drivers/*/*s3c64xx*
   + + F:       drivers/*/*s5pv210*
       F:       drivers/memory/samsung/*
       F:       drivers/soc/samsung/*
-- ----F:       drivers/spi/spi-s3c*
   - - F:       sound/soc/samsung/*
       F:       Documentation/arm/Samsung/
       F:       Documentation/devicetree/bindings/arm/samsung/
       F:       Documentation/devicetree/bindings/sram/samsung-sram.txt
@@@@@@@@ -7665,15 -7648,15 -7647,15 -7447,6 -7648,15 -7447,6 -7648,15 +7664,15 @@@@@@@@ W:      http://www.mellanox.co
       Q:       http://patchwork.ozlabs.org/project/netdev/list/
       F:       drivers/net/ethernet/mellanox/mlxsw/
       
 -- - -F:       drivers/infiniband/hw/rxe/
   + + SOFT-ROCE DRIVER (rxe)
   + + M:       Moni Shoua <monis@mellanox.com>
   + + L:       linux-rdma@vger.kernel.org
   + + S:       Supported
   + + W:       https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
   + + Q:       http://patchwork.kernel.org/project/linux-rdma/list/
 ++++++F:       drivers/infiniband/sw/rxe/
   + + F:       include/uapi/rdma/rdma_user_rxe.h
   + + 
       MEMBARRIER SUPPORT
       M:       Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
       M:       "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

diff --cc drivers/spi/spi.c
Simple merge