]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 04:39:28 +0000 (14:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 04:39:28 +0000 (14:39 +1000)
commitf1d1c403a294774b013330eeedf485c67648ef66
treebc6425c6621d0b02bb1fa4ebcbbe606bca5223c8
parent40eb978f21553a56f8cb8fdd640b1d5d72323ef5
parentaeb87c3cb7416d4d5931bc939cc083c731479de0
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/s390/include/asm/pgtable.h
arch/s390/include/asm/pgtable.h
arch/s390/mm/pgtable.c
arch/x86/kvm/emulate.c
arch/x86/kvm/lapic.c
virt/kvm/arm/arch_timer.c