]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'perf/core'
authorIngo Molnar <mingo@kernel.org>
Wed, 24 Oct 2012 08:41:44 +0000 (10:41 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 24 Oct 2012 08:41:44 +0000 (10:41 +0200)
1  2 
arch/x86/kernel/cpu/perf_event_p6.c

Simple merge