Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/perf.h
	tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

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

diff --cc arch/powerpc/kernel/perf_event.c
Simple merge

diff --cc arch/x86/include/asm/perf_event.h
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event.h
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc include/trace/events/sched.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/events/hw_breakpoint.c
Simple merge

diff --cc kernel/irq/chip.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc tools/perf/util/evlist.c
Simple merge

diff --cc tools/perf/util/probe-event.c
Simple merge

diff --cc tools/perf/util/probe-finder.c
Simple merge