]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'perf/urgent'
authorIngo Molnar <mingo@elte.hu>
Fri, 2 Mar 2012 11:21:40 +0000 (12:21 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 2 Mar 2012 11:21:40 +0000 (12:21 +0100)
1  2 
arch/x86/include/asm/perf_event.h
arch/x86/kernel/cpu/perf_event.h

Simple merge
Simple merge