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: e27c61d 8ca40a7)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 30 Oct 2012 02:47:06 +0000 (13:47 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 30 Oct 2012 02:47:10 +0000 (13:47 +1100)
commit	259364d24edd94b11efd1dad83798f47df46fddc
tree	a83d6a970d1c6e3d78a9ff9e4bd46ef4cd3595bf	tree \| snapshot
parent	e27c61d478a0d4db0fae71734c357033f83fd8f2	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

13 files changed:

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	diff1 \|	diff2 \|	blob \| history
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/x86/kvm/mmu.c	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/kvm.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules