Merge branches 'hwbreak', 'perf/updates' and 'perf/system-pmus' into for-rmk
authorWill Deacon <will.deacon@arm.com>
Wed, 31 Aug 2011 09:50:37 +0000 (10:50 +0100)
committerWill Deacon <will.deacon@arm.com>
Wed, 31 Aug 2011 09:50:37 +0000 (10:50 +0100)

Trivial merge