]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Merge branch 'x86/urgent' into x86/mce3
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Jun 2009 16:21:41 +0000 (18:21 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Jun 2009 16:21:41 +0000 (18:21 +0200)
Conflicts:
arch/x86/kernel/cpu/mcheck/mce_intel.c

Merge reason: merge with an urgent-branch MCE fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/cpu/mcheck/mce.c

Simple merge