]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'perf/updates' into for-next/perf
authorWill Deacon <will.deacon@arm.com>
Mon, 15 Oct 2012 13:00:08 +0000 (14:00 +0100)
committerWill Deacon <will.deacon@arm.com>
Mon, 15 Oct 2012 13:00:08 +0000 (14:00 +0100)
1  2 
arch/arm/kernel/perf_event.c

Simple merge