1ba8c8
parent ee568b25ee9e160b32d1aef73d8b2ee9c05d34db
author Ingo Molnar <mingo@elte.hu> 1237378789 +0100
committer Ingo Molnar <mingo@elte.hu> 1237378789 +0100

Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core

Conflicts:
	arch/parisc/kernel/irq.c
0®