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: 640010c 7de5bdc)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 17 Sep 2012 06:37:30 +0000 (16:37 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 17 Sep 2012 06:37:30 +0000 (16:37 +1000)
commit	e0907bd3cb008ca6851b50026edd13dded4541b1
tree	bc7156d133c6de1ec5cd7a7528e6e9cf6841024e	tree \| snapshot
parent	640010ceebae58aec003d03cdd6e58e6fcb432a3	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/kernel/setup.c	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