From 823c915e594c2bbff0b8d77fb1dceb4b3d73341d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?=
 <manuel.pegourie-gonnard@arm.com>
Date: Mon, 2 Jul 2018 12:05:49 +0200
Subject: [PATCH] Fix mis-merged ChangeLog

---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1d1ec7c04..ab5a01742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ Features
      in ECP, ECDSA, PK and X509 (CRL not supported yet), and using existing
      functions in ECDH and SSL (currently only implemented client-side, for
      ECDHE-ECDSA ciphersuites with TLS 1.2, including client authentication).
+
+= mbed TLS 2.11.0 branch released 2018-06-18
+
+Features
    * Add additional block mode, OFB (Output Feedback), to the AES module and
      cipher abstraction module.
    * Implement the HMAC-based extract-and-expand key derivation function