Ingo Molnar 0d5959723e Merge branch 'linus' into x86/mce3 ...

Conflicts:
	arch/x86/kernel/cpu/mcheck/mce_64.c
	arch/x86/kernel/irq.c

Merge reason: Resolve the conflicts above.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-06-11 23:31:52 +02:00

..

00-INDEX

x86: move x86-specific documentation into Documentation/x86

2008-05-30 17:19:03 -07:00

boot-options.txt

Merge branch 'linus' into x86/mce3

2009-06-11 23:31:52 +02:00

cpu-hotplug-spec

x86: move x86-specific documentation into Documentation/x86

2008-05-30 17:19:03 -07:00

fake-numa-for-cpusets

trivial: fix where cgroup documentation is not correctly referred to

2009-03-30 15:22:02 +02:00

kernel-stacks

x86: move x86-specific documentation into Documentation/x86

2008-05-30 17:19:03 -07:00

machinecheck

x86, mce: switch x86 machine check handler to Monarch election.

2009-06-03 14:45:12 -07:00

mm.txt

x86: fix typo in address space documentation

2009-05-05 19:10:18 -07:00

uefi.txt

x86 boot: only pick up additional EFI memmap if add_efi_memmap flag

2008-07-08 13:10:41 +02:00