]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:55:42 +0000 (13:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:55:42 +0000 (13:55 +1000)
commit78e473f55ecd84bd913567f281fd1739a5a4df62
tree71d646081d8fd58014ffd2e9d5e71f3341b5f9e5
parente064d8845ad3b4f3a2e4d757bce54cf812d8d642
parente15802caae469ba0d5f59e3a28f53d1accf7f332
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
include/linux/kvm.h
Documentation/kernel-parameters.txt
include/linux/kvm.h