Merge branch 'for-rmk/perf' into for-rmk/virt/kvm/core
authorWill Deacon <will.deacon@arm.com>
Wed, 23 Jan 2013 17:17:52 +0000 (17:17 +0000)
committerWill Deacon <will.deacon@arm.com>
Wed, 23 Jan 2013 17:17:52 +0000 (17:17 +0000)

Trivial merge