Merge branches 'edac-ghes' and 'edac-misc' into edac-updates-for-v6.2

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 72e80c0..3c48522 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7356,9 +7356,9 @@ F:        drivers/edac/thunderx_edac*
 
 EDAC-CORE
 M:     Borislav Petkov <bp@alien8.de>
-M:     Mauro Carvalho Chehab <mchehab@kernel.org>
 M:     Tony Luck <tony.luck@intel.com>
 R:     James Morse <james.morse@arm.com>
+R:     Mauro Carvalho Chehab <mchehab@kernel.org>
 R:     Robert Richter <rric@kernel.org>
 L:     linux-edac@vger.kernel.org
 S:     Supported
@@ -7475,8 +7475,7 @@ S:        Maintained
 F:     drivers/edac/pnd2_edac.[ch]
 
 EDAC-QCOM
-M:     Channagoud Kadabi <ckadabi@codeaurora.org>
-M:     Venkata Narendra Kumar Gutta <vnkgutta@codeaurora.org>
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 L:     linux-arm-msm@vger.kernel.org
 L:     linux-edac@vger.kernel.org
 S:     Maintained
@@ -15411,7 +15410,7 @@ M:      Stafford Horne <shorne@gmail.com>
 L:     openrisc@lists.librecores.org
 S:     Maintained
 W:     http://openrisc.io
-T:     git git://github.com/openrisc/linux.git
+T:     git https://github.com/openrisc/linux.git
 F:     Documentation/devicetree/bindings/openrisc/
 F:     Documentation/openrisc/
 F:     arch/openrisc/