Merge ../powerpc-merge

diff --cc arch/powerpc/Makefile
Simple merge

diff --cc arch/powerpc/kernel/head_64.S
Simple merge

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

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/powermac/feature.c
Simple merge

diff --cc kernel/auditsc.c
Simple merge