Merge commit 'origin/queue' into for-queue
authorAlexander Graf <agraf@suse.de>
Wed, 31 Oct 2012 12:36:18 +0000 (13:36 +0100)
committerAlexander Graf <agraf@suse.de>
Wed, 31 Oct 2012 12:36:18 +0000 (13:36 +0100)
commit0588000eac9ba4178cebade437da3b28e8fad48f
tree697e514a0a0193f17a54f372dd18c5cd3927e154
parent8b5869ad85f703ffeb25e656eab826f6b85b984c
parent81c52c56e2b43589091ee29038bcf793d3f184ab
Merge commit 'origin/queue' into for-queue

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
arch/powerpc/include/asm/smp.h
arch/powerpc/include/uapi/asm/Kbuild
arch/powerpc/include/uapi/asm/epapr_hcalls.h
arch/powerpc/kernel/smp.c
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S