linux-next: manual merge of the kvm tree with the rr tree
From: Stephen Rothwell
Date: Tue Dec 27 2011 - 23:17:53 EST
Today's linux-next merge of the kvm tree got a conflict in
arch/x86/kvm/mmu.c between commit d6e5215aba76 ("module_param: make bool
parameters really bool (arch)") from the rr tree and commit d750ea28865d
("KVM: MMU: remove oos_shadow parameter") from the kvm tree.
The latter just removed the code modified by the former, so I did that.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature