Merge branch 'linux-2.6'

diff --cc Documentation/kernel-parameters.txt
Simple merge

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

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

diff --cc arch/powerpc/oprofile/cell/vma_map.c
Simple merge

diff --cc arch/powerpc/sysdev/cpm2.c
Simple merge