summaryrefslogtreecommitdiff
path: root/maintainers.rst
diff options
context:
space:
mode:
authorDan Handley <dan.handley@arm.com>2018-03-01 18:44:00 +0000
committerDavid Cunado <david.cunado@arm.com>2018-03-15 17:00:34 +0000
commit4def07d5352893a33af18b04795f875fabff14de (patch)
tree4e0cf6a8d7cb0fb9f78b6d757f682ddd876cf665 /maintainers.rst
parentc3e34a9e018532a5ff669c67028cb8d1dea7c7d2 (diff)
Update Arm TF references to TF-A
Update Arm Trusted Firmware references in the upstream documents to Trusted Firmware-A (TF-A). This is for consistency with and disambiguation from Trusted Firmware-M (TF-M). Also update other Arm trademarks, e.g. ARM->Arm, ARMv8->Armv8-A. Change-Id: I8bb0e18af29c6744eeea2dc6c08f2c10b20ede22 Signed-off-by: Dan Handley <dan.handley@arm.com> Signed-off-by: David Cunado <david.cunado@arm.com>
Diffstat (limited to 'maintainers.rst')
-rw-r--r--maintainers.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/maintainers.rst b/maintainers.rst
index 72a11a5a..77b851e9 100644
--- a/maintainers.rst
+++ b/maintainers.rst
@@ -1,7 +1,7 @@
-ARM Trusted Firmware Maintainers
-================================
+Trusted Firmware-A maintainers
+==============================
-ARM Trusted Firmware is an ARM maintained project. All contributions are
+Trusted Firmware-A (TF-A) is an Arm maintained project. All contributions are
ultimately merged by the maintainers listed below. Technical ownership of some
parts of the codebase is delegated to the sub-maintainers listed below. An
acknowledgement from these sub-maintainers may be required before the
@@ -123,8 +123,8 @@ Files:
- docs/plat/xilinx-zynqmp.rst
- plat/xilinx/\*
-ARMv7 architecture sub-maintainer
----------------------------------
+Armv7-A architecture sub-maintainer
+-----------------------------------
Etienne Carriere (etienne.carriere@linaro.org, `etienne-lms`_)