Robert Richter 1241eb8f13 Merge commit 'tip/perfcounters-for-linus' into oprofile/master ... Conflicts: arch/x86/oprofile/op_model_ppro.c Signed-off-by: Robert Richter <robert.richter@amd.com>		2009-06-12 17:58:48 +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-06-10 16:14:41 -07:00
configs	Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:30:41 -07:00
crypto	crypto: aes-ni - Add support to Intel AES-NI instructions for x86_64 platform	2009-02-18 16:48:06 +08:00
ia32	Merge branch 'core/signal' into perfcounters/core	2009-04-30 21:16:49 +02:00
include/asm	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
kernel	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
kvm	KVM: Fix PDPTR reloading on CR4 writes	2009-05-25 20:00:53 +03:00
lguest	Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 16:16:27 -07:00
lib	x86: memcpy, clean up	2009-03-12 12:21:17 +01:00
math-emu	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
mm	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
oprofile	Merge commit 'tip/perfcounters-for-linus' into oprofile/master	2009-06-12 17:58:48 +02:00
pci	Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:25:41 -07:00
power	x86: disable stack-protector for __restore_processor_state()	2009-04-03 19:48:41 +02:00
vdso	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
video
xen	Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 16:16:27 -07:00
Kbuild	x86: standardize Kbuild rules	2009-04-16 18:09:02 +02:00
Kconfig	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
Kconfig.cpu	Revert "x86, bts: reenable ptrace branch trace support"	2009-06-11 00:32:00 +02:00
Kconfig.debug	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 19:53:40 -07:00
Makefile	Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:30:41 -07:00
Makefile_32.cpu