Merge branch 'perf/core' into perf/updates
authorWill Deacon <will.deacon@arm.com>
Wed, 27 May 2015 15:12:18 +0000 (16:12 +0100)
committerWill Deacon <will.deacon@arm.com>
Wed, 27 May 2015 15:12:18 +0000 (16:12 +0100)

Trivial merge