]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 792363d 100b33c)
Merge commit 'v2.6.38-rc4' into x86/cpu
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Feb 2011 12:18:51 +0000 (13:18 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Feb 2011 12:18:56 +0000 (13:18 +0100)
Merge reason: pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/include/asm/smp.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/smp.h
Simple merge
diff --cc arch/x86/kernel/smpboot.c
Simple merge
Michael's Linux tree.