]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 05:27:08 +0000 (15:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 05:27:08 +0000 (15:27 +1000)
commit508d350cf9421b55f387c0ddfde2e57e67a337c0
treead7f33575890975ac164c197d83c6d8700552978
parent15400d7ca25fc6e5742062c55809241bb13e77e1
parente15802caae469ba0d5f59e3a28f53d1accf7f332
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
include/linux/kvm.h
Documentation/kernel-parameters.txt
arch/x86/kvm/emulate.c
arch/x86/kvm/mmu.c
include/linux/kvm.h