H. Peter Anvin 8e4029ee35 Merge branch 'x86/urgent' into core/memblock ...

Reason for merge:

Forward-port urgent change to arch/x86/mm/srat_64.c to the memblock tree.

Resolved Conflicts:
	arch/x86/mm/srat_64.c

Originally-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

2010-10-11 17:05:11 -07:00

..

boot

x86, setup: Fix earlyprintk=serial,0x3f8,115200

2010-09-21 10:18:33 -07:00

configs

defconfig reduction

2010-08-14 22:26:53 +02:00

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2010-05-03 11:28:58 +08:00

ia32

x86-64, compat: Retruncate rax after ia32 syscall entry tracing

2010-09-14 16:08:47 -07:00

include/asm

Merge commit 'v2.6.36-rc7' into core/memblock

2010-10-08 09:15:00 +02:00

kernel

Merge branch 'x86/urgent' into core/memblock

2010-10-11 17:05:11 -07:00

kvm

KVM: i8259: fix migration

2010-09-08 14:50:58 -03:00

lguest

lguest: update comments to reflect LHCALL_LOAD_GDT_ENTRY.

2010-09-21 10:54:02 +09:30

lib

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

2010-08-13 10:35:48 -07:00

math-emu

x86, fpu: Unbreak FPU emulation

2010-05-10 13:37:16 -07:00

mm

Merge branch 'x86/urgent' into core/memblock

2010-10-11 17:05:11 -07:00

oprofile

oprofile: Add Support for Intel CPU Family 6 / Model 29

2010-09-21 12:22:48 +02:00

pci

x86/PCI: use for_each_pci_dev()

2010-07-30 09:47:33 -07:00

power

x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states

2010-08-20 14:59:02 +02:00

tools

x86: Remove trailing spaces in messages

2010-02-07 17:47:51 +01:00

vdso

Merge branches 'x86-cleanups-for-linus', 'x86-vmware-for-linus', 'x86-mtrr-for-linus', 'x86-apic-for-linus', 'x86-fpu-for-linus' and 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-08-06 16:22:59 -07:00

video

…

xen

memblock: Allow memblock_init to be called early

2010-10-11 15:59:01 -07:00

.gitignore

add random binaries to .gitignore

2010-04-08 11:34:34 +02:00

Kbuild

x86: standardize Kbuild rules

2009-04-16 18:09:02 +02:00

Kconfig

Merge commit 'v2.6.36-rc3' into x86/memblock

2010-08-31 09:45:46 +02:00

Kconfig.cpu

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

2010-05-18 08:58:16 -07:00

Kconfig.debug

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

2010-05-18 08:40:21 -07:00

Makefile

x86, build: Disable -fPIE when compiling with CONFIG_CC_STACKPROTECTOR=y

2010-09-13 15:53:16 -07:00

Makefile_32.cpu

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

2009-12-08 13:38:11 -08:00