Merge commit 'v2.6.26-rc9' into x86/cpu

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/process_32.c
Simple merge

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/pci/pci.h
Simple merge