Merge branch 'x86/cleanups' into perf/uprobes
Ingo Molnar [Tue, 13 Mar 2012 15:32:54 +0000 (16:32 +0100)]
Merge reason: We want to merge a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/powerpc/kernel/perf_event.c
arch/x86/Kconfig
arch/x86/include/asm/perf_event.h
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event.h
kernel/events/core.c
kernel/events/hw_breakpoint.c
tools/perf/util/evlist.c
tools/perf/util/probe-event.c
tools/perf/util/probe-finder.c

Simple merge
Simple merge
Simple merge
  #include <asm/apic.h>
  #include <asm/stacktrace.h>
  #include <asm/nmi.h>
- #include <asm/compat.h>
  #include <asm/smp.h>
  #include <asm/alternative.h>
 +#include <asm/timer.h>
  
  #include "perf_event.h"
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge