tree 9b1d3e8f7d02a2e3ff4221f354c9dd55020e36c3
parent 6a7cbfd56837409b85c26df0206177e59fc95a79
parent 0aad563c74807195cc7fe2208d17e2d889157f1e
author Sandrine Bailleux <sandrine.bailleux@arm.com> 1569237227 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> 1569237227 +0000

Merge changes I66dc6855,I2217a1ad into integration

* changes:
  rockchip: Update BL31_BASE to 0x40000
  rockchip: Fix typo for TF content text