Merge http://jdike.stearns.org:5000/highmem-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

diff --cc arch/um/defconfig
Simple merge

diff --cc arch/um/kernel/mem.c
Simple merge

diff --cc arch/um/kernel/process_kern.c
Simple merge

diff --cc include/asm-um/pgtable.h
Simple merge