summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorShaohua Li <shli@fb.com>2016-02-03 15:43:59 -0800
committerShaohua Li <shli@fb.com>2016-02-03 15:43:59 -0800
commit9ea064158f4e02e64890ee1261449b01e954e594 (patch)
tree9e5f342207e6f679c312c114bf190d24980c0246 /MAINTAINERS
parentb37a05c083c85c2657dca9bbe1f5d79dccf756d5 (diff)
parentfc2561ec0afcd89e2ec6f28a82a9219582844964 (diff)
downloadlinux-9ea064158f4e02e64890ee1261449b01e954e594.tar.gz
linux-9ea064158f4e02e64890ee1261449b01e954e594.tar.bz2
linux-9ea064158f4e02e64890ee1261449b01e954e594.zip
Merge branch 'mymd/for-next' into mymd/for-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 24c5b9a29670..eef506a9f0ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10174,6 +10174,7 @@ S: Supported
F: drivers/media/pci/solo6x10/
SOFTWARE RAID (Multiple Disks) SUPPORT
+M: Shaohua Li <shli@kernel.org>
L: linux-raid@vger.kernel.org
T: git git://neil.brown.name/md
S: Supported