]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge branch 'x86/core' into x86/cleanups
authorIngo Molnar <mingo@elte.hu>
Sat, 27 Dec 2008 10:30:05 +0000 (11:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 27 Dec 2008 10:30:05 +0000 (11:30 +0100)
1  2 
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/traps.c

Simple merge
Simple merge