[edk2-platforms][ 2/3] Merge Maintainers.txt in Platform\Intel and Silicon\Intel to root directory

["Liming Gao" <liming.gao@intel.com>]

Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 Maintainers.txt                | 41 +++++++++++++++++++++++++++++
 Platform/Intel/Maintainers.txt | 60 ------------------------------------------
 Silicon/Intel/Maintainers.txt  | 58 ----------------------------------------
 3 files changed, 41 insertions(+), 118 deletions(-)
 delete mode 100644 Platform/Intel/Maintainers.txt
 delete mode 100644 Silicon/Intel/Maintainers.txt

diff --git a/Maintainers.txt b/Maintainers.txt
index 6477591e68..324bd0ab92 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -43,7 +43,48 @@ M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 M: Leif Lindholm <leif.lindholm@linaro.org>
 M: Michael D Kinney <michael.d.kinney@intel.com>
 
+Platform/Intel/AdvancedFeaturePkg
+M: Michael Kubacki <michael.a.kubacki@intel.com>
+M: Sai Chaganty <rangasai.v.chaganty@intel.com>
+
+Platform/Intel/ClevoOpenBoardPkg
+M: Michael Kubacki <michael.a.kubacki@intel.com>
+M: Ankit Sinha <ankit.sinha@intel.com>
+R: Nate DeSimone <nathaniel.l.desimone@intel.com>
+
+Platform/Intel/KabylakeOpenBoardPkg
+M: Chasel Chiu <chasel.chiu@intel.com>
+M: Michael Kubacki <michael.a.kubacki@intel.com>
+
+Platform/Intel/MinPlatformPkg
+M: Michael Kubacki <michael.a.kubacki@intel.com>
+R: Chasel Chiu <chasel.chiu@intel.com>
+
+Platform/Intel/PurleyOpenBoardPkg
+M: Shifei A Lu <shifei.a.lu@intel.com>
+M: Xiaohu Zhou <bowen.zhou@intel.com>
+M: Isaac W Oram <isaac.w.oram@intel.com>
+
 Silicon
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 M: Leif Lindholm <leif.lindholm@linaro.org>
 M: Michael D Kinney <michael.d.kinney@intel.com>
+
+Silicon/Intel/KabylakeSiliconPkg
+M: Chasel Chiu <chasel.chiu@intel.com>
+M: Michael A Kubacki <michael.a.kubacki@intel.com>
+
+Silicon/Intel/LewisburgPkg
+M: Piwko, Maciej <maciej.piwko@intel.com>
+M: Bu, Daocheng <daocheng.bu@intel.com>
+M: Oram, Isaac W <isaac.w.oram@intel.com>
+
+Silicon/Intel/PurleyRcPkg
+M: Gillispie, Thad <thad.gillispie@intel.com>
+M: Bu, Daocheng <daocheng.bu@intel.com>
+M: Oram, Isaac W <isaac.w.oram@intel.com>
+
+Silicon/Intel/PurleySktPkg
+M: Gillispie, Thad <thad.gillispie@intel.com>
+M: Bu, Daocheng <daocheng.bu@intel.com>
+M: Oram, Isaac W <isaac.w.oram@intel.com>
diff --git a/Platform/Intel/Maintainers.txt b/Platform/Intel/Maintainers.txt
deleted file mode 100644
index 0004f6a829..0000000000
--- a/Platform/Intel/Maintainers.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-EDK II Maintainers
-==================
-
-This file provides information about the primary maintainers for
-EDK II.
-
-In general, you should not privately email the maintainer. You should
-email the edk2-devel list, but you can also Cc the maintainer.
-
-Descriptions of section entries:
-
-  L: Mailing list that is relevant to this area (default is edk2-devel)
-     Patches and questions should be sent to the email list.
-  M: Cc address for patches and questions (ie, the package maintainer)
-  W: Web-page with status/info
-  T: SCM tree type and location.  Type is one of: git, svn.
-  S: Status, one of the following:
-     Supported:  Someone is actually paid to look after this.
-     Maintained: Someone actually looks after it.
-     Odd Fixes:  It has a maintainer but they don't have time to do
-                 much other than throw the odd patch in. See below.
-     Orphan:     No current maintainer [but maybe you could take the
-                 role as you write your new code].
-     Obsolete:   Old code. Something tagged obsolete generally means
-                 it has been replaced by a better system and you
-                 should be using that.
-
-EDK II
-------
-W: http://www.tianocore.org/edk2/
-L: https://lists.sourceforge.net/lists/listinfo/edk2-devel
-T: git - https://github.com/tianocore/edk2-platforms.git
-
-Responsible Disclosure, Reporting Security Issues
--------------------------------------------------
-W: https://github.com/tianocore/tianocore.github.io/wiki/Security
-
-EDK II Packages:
-----------------
-AdvancedFeaturePkg
-M: Michael Kubacki <michael.a.kubacki@intel.com>
-M: Sai Chaganty <rangasai.v.chaganty@intel.com>
-
-ClevoOpenBoardPkg
-M: Michael Kubacki <michael.a.kubacki@intel.com>
-M: Ankit Sinha <ankit.sinha@intel.com>
-R: Nate DeSimone <nathaniel.l.desimone@intel.com>
-
-KabylakeOpenBoardPkg
-M: Chasel Chiu <chasel.chiu@intel.com>
-M: Michael Kubacki <michael.a.kubacki@intel.com>
-
-MinPlatformPkg
-M: Michael Kubacki <michael.a.kubacki@intel.com>
-R: Chasel Chiu <chasel.chiu@intel.com>
-
-PurleyOpenBoardPkg
-M: Shifei A Lu <shifei.a.lu@intel.com>
-M: Xiaohu Zhou <bowen.zhou@intel.com>
-M: Isaac W Oram <isaac.w.oram@intel.com>
diff --git a/Silicon/Intel/Maintainers.txt b/Silicon/Intel/Maintainers.txt
deleted file mode 100644
index 8fa53c9008..0000000000
--- a/Silicon/Intel/Maintainers.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-EDK II Maintainers
-==================
-
-This file provides information about the primary maintainers for
-EDK II.
-
-In general, you should not privately email the maintainer. You should
-email the edk2-devel list, but you can also Cc the maintainer.
-
-Descriptions of section entries:
-
-  L: Mailing list that is relevant to this area (default is edk2-devel)
-     Patches and questions should be sent to the email list.
-  M: Cc address for patches and questions (ie, the package maintainer)
-  W: Web-page with status/info
-  T: SCM tree type and location.  Type is one of: git, svn.
-  S: Status, one of the following:
-     Supported:  Someone is actually paid to look after this.
-     Maintained: Someone actually looks after it.
-     Odd Fixes:  It has a maintainer but they don't have time to do
-                 much other than throw the odd patch in. See below.
-     Orphan:     No current maintainer [but maybe you could take the
-                 role as you write your new code].
-     Obsolete:   Old code. Something tagged obsolete generally means
-                 it has been replaced by a better system and you
-                 should be using that.
-
-EDK II
-------
-W: http://www.tianocore.org/edk2/
-L: https://lists.sourceforge.net/lists/listinfo/edk2-devel
-T: git - https://github.com/tianocore/edk2-platforms.git
-
-Responsible Disclosure, Reporting Security Issues
--------------------------------------------------
-W: https://github.com/tianocore/tianocore.github.io/wiki/Security
-
-EDK II Packages:
-----------------
-KabylakeSiliconPkg
-M: Chasel Chiu <chasel.chiu@intel.com>
-M: Michael A Kubacki <michael.a.kubacki@intel.com>
-
-LewisburgPkg
-M: Piwko, Maciej <maciej.piwko@intel.com>
-M: Bu, Daocheng <daocheng.bu@intel.com>
-M: Oram, Isaac W <isaac.w.oram@intel.com>
-
-PurleyRcPkg
-M: Gillispie, Thad <thad.gillispie@intel.com>
-M: Bu, Daocheng <daocheng.bu@intel.com>
-M: Oram, Isaac W <isaac.w.oram@intel.com>
-
-PurleySktPkg
-M: Gillispie, Thad <thad.gillispie@intel.com>
-M: Bu, Daocheng <daocheng.bu@intel.com>
-M: Oram, Isaac W <isaac.w.oram@intel.com>
-
-- 
2.13.0.windows.1