]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 638bee7 645af4e)
Merge branch 'x86/core' into x86/mce2
authorH. Peter Anvin <hpa@zytor.com>
Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 4 Mar 2009 05:05:42 +0000 (21:05 -0800)
1  2 
arch/x86/Kconfig patch | diff1 | diff2 | blob | history
arch/x86/kernel/alternative.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/kernel/alternative.c
Simple merge
Clone of davem's net-next-2.6 tree