Merge branch 'jejb-scsi' into misc

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 69c8a9c3289adbe64a7e68e134372515d1fd2e0f..6769e771ea67383b2e322743177afddbf80a4e65 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5038,6 +5038,13 @@ F:       include/uapi/linux/if_hippi.h
 F:     net/802/hippi.c
 F:     drivers/net/hippi/
 
+HISILICON SAS Controller
+M:     John Garry <john.garry@huawei.com>
+W:     http://www.hisilicon.com
+S:     Supported
+F:     drivers/scsi/hisi_sas/
+F:     Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
+
 HOST AP DRIVER
 M:     Jouni Malinen <j@w1.fi>
 L:     hostap@shmoo.com (subscribers-only)