From: Mark Brown Date: Tue, 6 Sep 2016 11:32:09 +0000 (+0100) Subject: Merge remote-tracking branches 'spi/fix/lock', 'spi/fix/maintainers', 'spi/fix/put... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ae4860b5333586b60ca1798f3f83b8b37520904c;p=deliverable%2Flinux.git Merge remote-tracking branches 'spi/fix/lock', 'spi/fix/maintainers', 'spi/fix/put', 'spi/fix/pxa2xx', 'spi/fix/sh-msiof' and 'spi/fix/timeout' into spi-linus --- ae4860b5333586b60ca1798f3f83b8b37520904c diff --cc MAINTAINERS index db814a89599c,20bb1d00098c,5051c2f46d47,7aa632f461dc,20bb1d00098c,7aa632f461dc,20bb1d00098c..1fbd77d2de77 --- a/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/ + + SOFT-ROCE DRIVER (rxe) + + M: Moni Shoua + + 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/hw/rxe/ ++++++F: drivers/infiniband/sw/rxe/ + + F: include/uapi/rdma/rdma_user_rxe.h + + MEMBARRIER SUPPORT M: Mathieu Desnoyers M: "Paul E. McKenney"