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)
commit34bf5d0ff54d03f0a8ed690d47efb806ee2fffcb
tree5465f999b2b067744220b66c89b75f0f10445d6e
parentbd8b96dfc216eebc72950a6c40da8d3eca8667df
parent79a66b96c339626a3e4b226fefc0e45244cfe6ff
Merge branch 'x86/core' into x86/cleanups
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/traps.c