git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c7176fb 8ca40a7)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 31 Oct 2012 03:49:43 +0000 (14:49 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 31 Oct 2012 03:59:35 +0000 (14:59 +1100)
commit	a3d9372ac01f75183f5bbd602e2f250be6a8947b
tree	ae3751de238ec33dc6400fb55c9710ebcae1c0ea	tree \| snapshot
parent	c7176fb55051d9b5ea02f9e589ca89768514b214	commit \| diff
parent	8ca40a70a70988c0bdea106c894843f763ca2989	commit \| diff

Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h

16 files changed:

arch/powerpc/include/asm/epapr_hcalls.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/kvm_book3s.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/kvm_para.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/uapi/asm/Kbuild	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/uapi/asm/epapr_hcalls.h	\|	\|	blob
arch/powerpc/include/uapi/asm/kvm.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/uapi/asm/kvm_para.h	diff1 \|	\|	blob \| history
arch/powerpc/kernel/ppc_ksyms.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_32_mmu_host.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_64_mmu_host.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/trace.h	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/kvm-s390.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/mmu.c	diff1 \|	diff2 \|	blob \| history
include/linux/kvm_host.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/kvm.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules