Rusty Russell 558f6ab910 Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... Conflicts: arch/x86/include/asm/topology.h drivers/oprofile/buffer_sync.c (Both cases: changed in Linus' tree, removed in Ingo's).		2009-03-31 13:33:50 +10:30
..
boot	x86, setup: fix the setting of 480-line VGA modes	2009-03-18 16:54:05 -07:00
configs	Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linus' into x86/core	2009-02-26 06:31:32 +01: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 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
include/asm	Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-31 13:33:50 +10:30
kernel	Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-31 13:33:50 +10:30
kvm	KVM: VMX: Don't allow uninhibited access to EFER on i386	2009-03-24 11:03:15 +02:00
lguest	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio	2009-03-30 17:57:39 -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 cpumask-for-linus	2009-03-30 23:53:32 +02:00
oprofile	cpumask: x86: convert cpu_sibling_map/cpu_core_map to cpumask_var_t	2009-03-13 14:49:50 +10:30
pci	x86, PAT, PCI: Change vma prot in pci_mmap to reflect inherited prot	2009-03-24 10:42:35 +01:00
power	x86: use _types.h headers in asm where available	2009-02-13 11:35:01 -08:00
vdso	x86, mm: rename TASK_SIZE64 => TASK_SIZE_MAX	2009-02-21 00:09:44 +01:00
video	x86: video/fbdev.c: add MODULE_LICENSE	2008-05-04 20:04:46 +02:00
xen	Merge branch 'linus' into cpumask-for-linus	2009-03-30 23:53:32 +02:00
Kconfig	Merge branch 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-30 13:41:00 -07:00
Kconfig.cpu	x86/centaur: merge 32 & 64 bit version	2009-03-14 16:27:29 +01:00
Kconfig.debug	Merge branch 'linus' into x86/apic	2009-02-22 20:05:19 +01:00
Makefile	x86: use targets in the boot Makefile instead of CLEAN_FILES	2009-03-12 13:43:14 -07:00
Makefile_32.cpu	x86: merge winchip-2 and winchip-2a cpu choices	2008-10-13 10:22:48 +02:00