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)
commitad8537cda68a8fe81776cceca6c22d54dd652ea5
treebbef398c784fb884ca77fc2b7bee74c4ac5e1853
parent149936a068d83370c9dcd68894c276d4ba0f8560
parentfab06992de6433af097c4a1d2d1b119812753ca7
Merge branch 'perf/x86-ibs' into perf/core
arch/x86/include/asm/msr-index.h
arch/x86/include/asm/perf_event.h