From: Shaohua Li <shli@fb.com>
Date: Wed, 3 Feb 2016 23:43:59 +0000 (-0800)
Subject: Merge branch 'mymd/for-next' into mymd/for-linus
X-Git-Tag: MMI-PSA29.97-13-9~8563^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9ea064158f4e02e64890ee1261449b01e954e594;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'mymd/for-next' into mymd/for-linus
---

9ea064158f4e02e64890ee1261449b01e954e594
diff --cc MAINTAINERS
index 24c5b9a29670,fc1d1a5e4b66..eef506a9f0ab
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10174,8 -10022,8 +10174,9 @@@ S:	Supporte
  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
  F:	drivers/md/
  F:	include/linux/raid/