Merge pull request #1123 from robertovargas-arm/reset2

Integration of reset2 PSCI v1.1 functionality