diff options
author | Will Deacon <will.deacon@arm.com> | 2011-12-02 16:22:18 +0100 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2011-12-02 16:22:18 +0100 |
commit | ae72fd588a2b302222769b44775912b83f0785eb (patch) | |
tree | 63ada914372900e2ba355e2532eee40ee411c5cb /arch/arm/mach-omap2/board-2430sdp.c | |
parent | ARM: perf: add support for stalled cycle ABI events (diff) | |
parent | ARM: perf: remove unused armpmu_get_max_events (diff) | |
parent | arm: pmu: allow platform specific irq enable/disable handling (diff) | |
download | linux-ae72fd588a2b302222769b44775912b83f0785eb.tar.xz linux-ae72fd588a2b302222769b44775912b83f0785eb.zip |
Merge branches 'perf/event-nos', 'perf/updates' and 'perf/omap4' into for-rmk