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: 578309b 7de5bdc)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 13 Sep 2012 04:33:19 +0000 (14:33 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 13 Sep 2012 04:33:19 +0000 (14:33 +1000)
commit	a71eb125975dd5d19fe463321f4bf560bb5563d1
tree	eed3f559e4305a228c78058b96f3e56f3729a1f5	tree \| snapshot
parent	578309b77f5acd661ebfcd2f5691f6d86396ce71	commit \| diff
parent	7de5bdc96c372ab875408c86e0099958dba89f56	commit \| diff

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

Conflicts:
arch/s390/include/asm/processor.h
arch/x86/kvm/i8259.c

arch/s390/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/dis.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/priv.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules