linux_dsm_epyc7002/arch/x86
Frederic Weisbecker d7a4b414ee Merge commit 'linus/master' into tracing/kprobes
Conflicts:
	kernel/trace/Makefile
	kernel/trace/trace.h
	kernel/trace/trace_event_types.h
	kernel/trace/trace_export.c

Merge reason:
	Sync with latest significant tracing core changes.
2009-09-23 23:08:43 +02:00
..
boot Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-14 08:01:47 -07:00
configs tracing: Rename FTRACE_SYSCALLS for tracepoints 2009-08-26 00:17:35 +02:00
crypto Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-14 07:57:32 -07:00
ia32 perf: Do the big rename: Performance Counters -> Performance Events 2009-09-21 14:28:04 +02:00
include/asm Merge commit 'linus/master' into tracing/kprobes 2009-09-23 23:08:43 +02:00
kernel Merge commit 'linus/master' into tracing/kprobes 2009-09-23 23:08:43 +02:00
kvm Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm 2009-09-14 17:43:43 -07:00
lguest lguest: move panic notifier registration to its expected place. 2009-09-23 22:26:44 +09:30
lib Merge commit 'linus/master' into tracing/kprobes 2009-09-23 23:08:43 +02:00
math-emu Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +01:00
mm Merge commit 'linus/master' into tracing/kprobes 2009-09-23 23:08:43 +02:00
oprofile perf: Do the big rename: Performance Counters -> Performance Events 2009-09-21 14:28:04 +02:00
pci Merge branch 'sfi-base' into release 2009-09-19 00:37:13 -04:00
power x86: Remove final bits of CONFIG_X86_OLD_MCE 2009-09-18 08:31:23 +02:00
tools x86: Remove unused config macros from instruction decoder selftest 2009-09-04 18:14:15 +02:00
vdso time: Introduce CLOCK_REALTIME_COARSE 2009-08-21 21:43:46 +02:00
video
xen Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-18 14:05:47 -07:00
Kbuild x86: standardize Kbuild rules 2009-04-16 18:09:02 +02:00
Kconfig Merge git://git.infradead.org/iommu-2.6 2009-09-23 10:06:10 -07:00
Kconfig.cpu x86: add specific support for Intel Atom architecture 2009-08-23 11:20:02 +02:00
Kconfig.debug x86: X86 instruction decoder build-time selftest 2009-08-27 00:35:56 +02:00
Makefile Merge commit 'linus/master' into tracing/kprobes 2009-09-23 23:08:43 +02:00
Makefile_32.cpu x86: add specific support for Intel Atom architecture 2009-08-23 11:20:02 +02:00