Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 6 Sep 2012 23:48:59 +0000 (09:48 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 6 Sep 2012 23:48:59 +0000 (09:48 +1000)
commitfff34b3412b9401a76ba9d021db1bd91cb0e02b6
tree870ed2d1555004e7939d15b5099017aae61c97b8
parent28e1e58fb668e262648fb8ee8a24154633f40507
parent636802ef96eebe279b22ad9f9dacfe29291e45c7
Merge branch 'merge' into next

Brings in various bug fixes from 3.6-rcX
arch/powerpc/include/asm/processor.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/process.c
arch/powerpc/kernel/traps.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/perf/core-book3s.c