git.cascardo.info Git - cascardo/linux.git/commit

Merge commit 'origin/queue' into for-queue

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild

Unnamed repository; edit this file 'description' to name the repository.

arch/powerpc/include/asm/smp.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/uapi/asm/Kbuild	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/uapi/asm/epapr_hcalls.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv_rmhandlers.S	diff1 \|	diff2 \|	blob \| history