]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-arm-soc/cci-pmu' into for-next/perf
authorWill Deacon <will.deacon@arm.com>
Wed, 9 Oct 2013 13:33:41 +0000 (14:33 +0100)
committerWill Deacon <will.deacon@arm.com>
Wed, 9 Oct 2013 13:33:41 +0000 (14:33 +0100)

Trivial merge