git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a05ef16 ab9bad0)

author	Michael Ellerman <mpe@ellerman.id.au>
	Tue, 14 Feb 2017 06:18:29 +0000 (17:18 +1100)
committer	Michael Ellerman <mpe@ellerman.id.au>
	Tue, 14 Feb 2017 06:18:29 +0000 (17:18 +1100)
commit	da0e7e6276968fcc61ac7484d0026cd5fdd94dc3
tree	79a03731cca75ab4a41e7e7162288b22150811a3	tree \| snapshot
parent	a05ef161cdd22faccffe06f21fc8f1e249565385	commit \| diff
parent	ab9bad0ead9ab179ace09988a3f1cfca122eb7c2	commit \| diff

Merge branch 'topic/ppc-kvm' into next

Merge the topic branch we're sharing with the kvm-ppc tree.

16 files changed:

arch/powerpc/include/asm/head-64.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/hvcall.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/opal.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/prom.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/reg.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/exceptions-64s.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/idle_book3s.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/prom_init.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/init-common.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/pgtable-radix.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/pgtable_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powernv/opal-wrappers.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powernv/pci-ioda.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/firmware.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/lpar.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository