tree 802b623fff261ebcbbddadf84af5524398364a18
parent 62fdac5913f71f8f200bd2c9bd59a02e9a1498e9
parent 512626a04e72aca60effe111fa0333ed0b195d21
author Ingo Molnar <mingo@elte.hu> 1244755912 +0200
committer Ingo Molnar <mingo@elte.hu> 1244755912 +0200

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>