aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel/perf_event.c
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2011-12-02 15:22:18 +0000
committerWill Deacon <will.deacon@arm.com>2011-12-02 15:22:18 +0000
commitae72fd588a2b302222769b44775912b83f0785eb (patch)
tree63ada914372900e2ba355e2532eee40ee411c5cb /arch/arm/kernel/perf_event.c
parent0445e7a58e794d82c3a76975b1eefd920addbf39 (diff)
parentfeb45d06ffd7b59f43f1ed8edf53a0cfe3e7ad2a (diff)
parente0516a64e7ea9d9522d98f9f5f47aa38f147779f (diff)
downloadvexpress-lsk-ae72fd588a2b302222769b44775912b83f0785eb.tar.gz
Merge branches 'perf/event-nos', 'perf/updates' and 'perf/omap4' into for-rmk