tree b356490269c9e77d164dcc1477792b882fbb8bdb
parent ba1511bf7fbda452138e4096bf10d5a382710f4f
parent 071a0bc2ceace31266836801510879407a3701fa
author Ingo Molnar <mingo@elte.hu> 1234514662 +0100
committer Ingo Molnar <mingo@elte.hu> 1234514662 +0100

Merge branch 'linus' into x86/apic

Conflicts:
	arch/x86/kernel/acpi/boot.c
	arch/x86/mm/fault.c