From: Lauren Wehrmeister <lauren.wehrmeister@arm.com>
Date: Thu, 14 Jan 2021 22:45:20 +0000 (+0000)
Subject: Merge changes I36e4d672,I47610cee into integration
X-Git-Tag: baikal/aarch64/sdk5.9~1030
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=337e493306cbeda2b3e5c10f681607c7aea8bbb4;p=arm-tf.git

Merge changes I36e4d672,I47610cee into integration

* changes:
  Workaround for Cortex N1 erratum 1946160
  Workaround for Cortex A78 erratum 1951500
---

337e493306cbeda2b3e5c10f681607c7aea8bbb4