]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'perf/core'
authorIngo Molnar <mingo@kernel.org>
Sun, 28 Oct 2012 13:47:25 +0000 (14:47 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 28 Oct 2012 13:47:25 +0000 (14:47 +0100)
1  2 
arch/x86/kernel/cpu/perf_event_p6.c

Simple merge