tree 9d0405476e496b7863dc156a9b387b9ca26aaff9
parent f3ada4adb00723a540a77de88a2831313b443190
parent 6f486a6fb5c7311a8d07913778b53f128ec37cd8
author Gilles Peskine <Gilles.Peskine@arm.com> 1520957734 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1520957734 +0100

Merge remote-tracking branch 'upstream-restricted/pr/351' into development-restricted-proposed

Move the added ChangeLog entry to the bottom so that the list remains
in merge order.