diff options
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 40eaa356e355..6ee1e79ea16b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6353,6 +6353,7 @@ F: drivers/scsi/megaraid/ MELLANOX ETHERNET DRIVER (mlx4_en) M: Amir Vadai <amirv@mellanox.com> +M: Ido Shamay <idos@mellanox.com> L: netdev@vger.kernel.org S: Supported W: http://www.mellanox.com @@ -6972,6 +6973,13 @@ S: Supported F: drivers/block/nvme* F: include/linux/nvme.h +NXP-NCI NFC DRIVER +M: Clément Perrochaud <clement.perrochaud@effinnov.com> +R: Charles Gorand <charles.gorand@effinnov.com> +L: linux-nfc@lists.01.org (moderated for non-subscribers) +S: Supported +F: drivers/nfc/nxp-nci + NXP TDA998X DRM DRIVER M: Russell King <rmk+kernel@arm.linux.org.uk> S: Supported @@ -8380,7 +8388,6 @@ F: block/partitions/ibm.c S390 NETWORK DRIVERS M: Ursula Braun <ursula.braun@de.ibm.com> -M: Frank Blaschka <blaschka@linux.vnet.ibm.com> M: linux390@de.ibm.com L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ @@ -9856,7 +9863,7 @@ F: include/linux/wl12xx.h TIPC NETWORK LAYER M: Jon Maloy <jon.maloy@ericsson.com> -M: Allan Stephens <allan.stephens@windriver.com> +M: Ying Xue <ying.xue@windriver.com> L: netdev@vger.kernel.org (core kernel code) L: tipc-discussion@lists.sourceforge.net (user apps, general discussion) W: http://tipc.sourceforge.net/ |
