Merge mulgrave.(none):/home/jejb/BK/arch-split-2.5

into mulgrave.(none):/home/jejb/BK/arch-split-new-2.5

diff --cc arch/i386/Makefile
Simple merge

diff --cc arch/i386/config.in
Simple merge

diff --cc arch/i386/kernel/cpu/intel.c
Simple merge

diff --cc arch/i386/kernel/entry.S
Simple merge

diff --cc arch/i386/kernel/traps.c
Simple merge