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
..
boot	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
configs	ACPI: Remove Kconfig symbol ACPI_PROCFS	2014-02-19 00:27:37 +01:00
crypto	crypto: ghash-clmulni-intel - use C implementation for setkey()	2014-04-01 17:22:47 +08:00
ia32	constify copy_siginfo_to_user{,32}()	2013-11-09 00:16:29 -05:00
include	Merge branch 'perf/kprobes' into perf/core	2014-06-05 12:26:50 +02:00
kernel	Merge branch 'perf/kprobes' into perf/core	2014-06-05 12:26:50 +02:00
kvm	KVM: x86: Check for host supported fields in shadow vmcs	2014-04-28 11:14:51 +02:00
lguest	x86, asmlinkage, lguest: Fix C functions used by inline assembler	2014-01-29 22:17:17 -08:00
lib	kprobes, x86: Prohibit probing on thunk functions and restore	2014-04-24 10:02:58 +02:00
math-emu	x86: math-emu: Drop already-disabled print of build date	2014-01-27 23:14:12 +01:00
mm	kprobes, x86: Use NOKPROBE_SYMBOL() instead of __kprobes annotation	2014-04-24 10:26:38 +02:00
net	net: filter: add jited flag to indicate jit compiled filters	2014-03-31 00:45:08 -04:00
oprofile	x86, oprofile, nmi: Fix CPU hotplug callback registration	2014-03-20 13:43:43 +01:00
pci	CPU hotplug notifiers registration fixes for 3.15-rc1	2014-04-07 14:55:46 -07:00
platform	Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-04-02 13:15:58 -07:00
power	x86, asmlinkage, power: Make various symbols used by the suspend asm code visible	2013-08-06 14:21:03 -07:00
realmode	Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build	2014-01-29 09:07:00 -08:00
syscalls	x86/build: Supress "Nothing to be done for ..." messages	2014-04-14 11:44:36 +02:00
tools	x86/build: Supress "Nothing to be done for ..." messages	2014-04-14 11:44:36 +02:00
um	x86: Remove CONFIG_X86_OOSTORE	2014-03-11 10:16:18 -07:00
vdso	Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-04-22 09:09:06 -07:00
video
xen	Xen regression and bug fixes for 3.15-rc1.	2014-04-17 10:54:07 -07:00
.gitignore
Kbuild
Kconfig	Merge git://git.infradead.org/users/eparis/audit	2014-04-12 12:38:53 -07:00
Kconfig.cpu	Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-04-02 13:15:58 -07:00
Kconfig.debug	x86/efi: Dump the EFI page table	2014-03-04 16:17:17 +00:00
Makefile	x86: LLVMLinux: Wrap -mno-80387 with cc-option	2014-04-22 11:41:16 +02:00
Makefile_32.cpu
Makefile.um