Merge branch 'merge' into next

Brings in various bug fixes from 3.6-rcX

diff --cc arch/powerpc/include/asm/processor.h
Simple merge

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

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

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

diff --cc arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge

diff --cc arch/powerpc/perf/core-book3s.c
Simple merge