Merge branch 'linux-2.6'

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/mm/hash_utils_64.c
Simple merge

diff --cc arch/powerpc/platforms/cell/iommu.c
Simple merge