Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
Ingo Molnar [Mon, 8 Apr 2013 09:43:30 +0000 (11:43 +0200)]
Pull IBM zEnterprise EC12 support patchlet from Robert Richter.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1  2 
Makefile
arch/x86/include/uapi/asm/msr-index.h
arch/x86/kernel/cpu/perf_event_intel_ds.c
include/linux/perf_event.h

diff --cc Makefile
Simple merge
Simple merge
Simple merge