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

diff --cc MAINTAINERS
index 24c5b9a,fc1d1a5..eef506a
--- 1/MAINTAINERS
--- 2/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/