git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Fri, 11 Oct 2013 07:23:53 +0000 (18:23 +1100)
committer	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Fri, 11 Oct 2013 07:23:53 +0000 (18:23 +1100)
commit	3ad26e5c4459d3793ad65bc8929037c70515df83
tree	434327df7942878383e372988eb5f3bccb25de12	tree \| snapshot
parent	5293bf97a27e1be8ac6096aa198ff6a9e3e6837c	commit \| diff
parent	18461960cbf50bf345ef0667d45d5f64de8fb893	commit \| diff

Merge branch 'for-kvm' into next

Topic branch for commits that the KVM tree might want to pull
in separately.

Hand merged a few files due to conflicts with the LE stuff

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

John Crispins staging tree

RSS Atom

arch/powerpc/include/asm/machdep.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/ppc_asm.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/align.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/ppc_ksyms.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/signal_32.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/signal_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powernv/pci-ioda.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powernv/pci.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powernv/pci.h	diff1 \|	diff2 \|	blob \| history