Ingo Molnar 10b0256496 Merge branch 'perf/kprobes' into perf/core ...

Conflicts:
	arch/x86/kernel/traps.c

The kprobes enhancements are fully cooked, ship them upstream.

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

2014-06-05 12:26:50 +02:00

..

apic_flat_64.c

x86/apic: Switch wait_for_init_deassert() to a bool flag

2014-02-09 15:15:08 +01:00

apic_noop.c

x86/apic: Switch wait_for_init_deassert() to a bool flag

2014-02-09 15:15:08 +01:00

apic_numachip.c

x86/apic: Switch wait_for_init_deassert() to a bool flag

2014-02-09 15:15:08 +01:00

apic.c

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-04-11 11:58:33 -07:00

bigsmp_32.c

x86/apic: Switch wait_for_init_deassert() to a bool flag

2014-02-09 15:15:08 +01:00

hw_nmi.c

kprobes, x86: Use NOKPROBE_SYMBOL() instead of __kprobes annotation

2014-04-24 10:26:38 +02:00

io_apic.c

genirq: x86: Ensure that dynamic irq allocation does not conflict

2014-04-28 12:20:00 +02:00

ipi.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

Makefile

x86, platforms: Remove NUMAQ

2014-02-27 08:07:39 -08:00

probe_32.c

x86/apic: Switch wait_for_init_deassert() to a bool flag

2014-02-09 15:15:08 +01:00

probe_64.c

x86/platform: Introduce APIC post-initialization callback

2012-06-06 09:06:19 +02:00

x2apic_cluster.c

x86/apic: Switch wait_for_init_deassert() to a bool flag

2014-02-09 15:15:08 +01:00

x2apic_phys.c

x86/apic: Switch wait_for_init_deassert() to a bool flag

2014-02-09 15:15:08 +01:00

x2apic_uv_x.c

x86/apic: Switch wait_for_init_deassert() to a bool flag

2014-02-09 15:15:08 +01:00