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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8d1c39d 35fd68a)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 06:02:39 +0000 (16:02 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 06:02:39 +0000 (16:02 +1000)
commit	aaa09e8e7d2a3affbab2efe6e85392c3ad285425
tree	fa5125f3af2110ef9384cec2ee2b2f3b43d1e11e	tree \| snapshot
parent	8d1c39ddce9385db2e5fc1e5be2705db1cf7fd2f	commit \| diff
parent	35fd68a38d574188835110cde2937d18fe9b46dd	commit \| diff

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

Conflicts:
arch/mips/kernel/genex.S

15 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kvm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/powerpc.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/kvm-s390.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/ioapic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/lapic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
include/linux/kvm_host.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules