Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@kernel.org>
Mon, 8 Apr 2013 09:43:30 +0000 (11:43 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 8 Apr 2013 09:43:30 +0000 (11:43 +0200)
commit529801898b24544f93532217ce18a7ebbb2b8c4f
treec51c8fd808e6cff15cabb1a9ac29be0661942384
parentb847d0501afec4c7b12eb276aec10a2834f953ea
parent23995bbee01d75f09f72b1380bd6045a5b02947b
Merge branch 'for-tip' of git://git./linux/kernel/git/rric/oprofile into perf/core

Pull IBM zEnterprise EC12 support patchlet from Robert Richter.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Makefile
arch/x86/include/uapi/asm/msr-index.h
arch/x86/kernel/cpu/perf_event_intel_ds.c
include/linux/perf_event.h