]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-arm-soc/cci-pmu-v2' into for-next/perf
authorWill Deacon <will.deacon@arm.com>
Tue, 17 Sep 2013 16:07:21 +0000 (17:07 +0100)
committerWill Deacon <will.deacon@arm.com>
Tue, 17 Sep 2013 16:07:21 +0000 (17:07 +0100)

Trivial merge