commit b2fa1b3de679c37a8e85a50c30dc8e1beef7e620
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Wed Apr 28 17:31:23 2021 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Wed Apr 28 17:31:23 2021 +0200
tree 1f699367aa1532c5ce8c70d27ad30a235f72de37
parent 6946b8428b83db9ba5924cb09b61bc6ce84abd5c
parent 18b3f59282b54311486089e8de74b1ae69137b5d

Merge changes from topic "mp/update_release_timelines" into integration

* changes:
  docs: update release information for v2.6
  docs: update code freeze & target date for v2.5

docs/about/release-information.rst

diff --git a/docs/about/release-information.rst b/docs/about/release-information.rst
index 55c8bda..3e8dd91 100644
--- a/docs/about/release-information.rst
+++ b/docs/about/release-information.rst
@@ -44,7 +44,9 @@
 +-----------------+---------------------------+------------------------------+
 | v2.4            | 2nd week of Nov '20       | 4th week of Oct '20          |
 +-----------------+---------------------------+------------------------------+
-| v2.5            | 2nd week of May '21       | 4th week of Apr '21          |
+| v2.5            | 3rd week of May '21       | 5th week of Apr '21          |
++-----------------+---------------------------+------------------------------+
+| v2.6            | 4th week of Oct '21       | 1st week of Oct '21          |
 +-----------------+---------------------------+------------------------------+
 
 Removal of Deprecated Interfaces
@@ -64,4 +66,4 @@
 
 --------------
 
-*Copyright (c) 2018-2020, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2018-2021, Arm Limited and Contributors. All rights reserved.*