aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-22 03:44:59 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-22 03:44:59 -0400
commit8fd90bb889635fa1e7f80a3950948cc2e74c1446 (patch)
tree1490343b5ad9f88b9333e53fa9457c00cbf6c2d1 /MAINTAINERS
parent1bb4238b17b5de6cdc120970a9d00dd8a44f40df (diff)
parent15ba2236f3556fc01b9ca91394465152b5ea74b6 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/infiniband/hw/cxgb4/device.c The cxgb4 conflict was simply overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ae8cd00215b2..78215a5dea28 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8010,6 +8010,16 @@ F: drivers/ata/
8010F: include/linux/ata.h 8010F: include/linux/ata.h
8011F: include/linux/libata.h 8011F: include/linux/libata.h
8012 8012
8013SERIAL ATA AHCI PLATFORM devices support
8014M: Hans de Goede <hdegoede@redhat.com>
8015M: Tejun Heo <tj@kernel.org>
8016L: linux-ide@vger.kernel.org
8017T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
8018S: Supported
8019F: drivers/ata/ahci_platform.c
8020F: drivers/ata/libahci_platform.c
8021F: include/linux/ahci_platform.h
8022
8013SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER 8023SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
8014M: Jayamohan Kallickal <jayamohan.kallickal@emulex.com> 8024M: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
8015L: linux-scsi@vger.kernel.org 8025L: linux-scsi@vger.kernel.org