summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-04 20:50:15 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-04 20:50:15 +0100
commit5787c25240c92df25f34c1abb7f76a96d8615034 (patch)
treef3ab0655fc171c21af5de0b9d0e67c298350c30c /MAINTAINERS
parentMerge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledfo... (diff)
parentMerge branch 'mymd/for-next' into mymd/for-linus (diff)
downloadlinux-5787c25240c92df25f34c1abb7f76a96d8615034.tar.xz
linux-5787c25240c92df25f34c1abb7f76a96d8615034.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
Pull MD fix from Shaohua Li: "As you know, Neil steps down from MD. I'm looking after it. Here are some patches queued. A build fix from Gayatri and several trival patches from me" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md: md-cluster: delete useless code md-cluster: fix missing memory free raid6/algos.c : bug fix : Add the missing definitions to the pq.h file MD: add myself as MD maintainer MD: rename some functions
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5fa8d32b9b2e..a9010d992da3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10154,6 +10154,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