Merge branch 'perf/x86-ibs' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 9 May 2012 13:22:23 +0000 (15:22 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 9 May 2012 13:22:23 +0000 (15:22 +0200)
1  2 
arch/x86/include/asm/msr-index.h
arch/x86/include/asm/perf_event.h

Simple merge
Simple merge