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: 92c5945 96f7edf)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 04:52:39 +0000 (14:52 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 04:52:39 +0000 (14:52 +1000)
commit	d8228700abcd91d880afee3211c164ade6cec6c4
tree	6dafb2f05d4895ba0e8c11a92155ec11d2180fc5	tree \| snapshot
parent	92c5945d4db8f2983ee6c36ff88470569e37e4cd	commit \| diff
parent	96f7edf9a54ca834f030ddf30f91750b3d737a03	commit \| diff

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

Conflicts:
arch/s390/include/asm/pgtable.h

16 files changed:

Documentation/virtual/kvm/api.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/kvm/arm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kvm/interrupts_head.S	diff1 \|	diff2 \|	blob \| history
arch/arm/kvm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/entry64.S	diff1 \|	diff2 \|	blob \| history
arch/s390/mm/pgtable.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/kvm_host.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/emulate.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
virt/kvm/arm/arch_timer.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules