projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bf7b31 fe955e5)
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 patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.