linux-next: manual merge of the kvm tree

Hi Avi,

Today's linux-next merge of the kvm tree got a conflict in
include/linux/kvm.h between commit
ed8486243379ef3e6c61363df915882945c0eaec ("KVM: Advertise synchronized
mmu support to userspace") from Linus' tree (which also extsts in the kvm
tree) and commit a6a19661fc371c188b9cdeceba402b93de2b957f ("KVM: pci
device assignment") from the kvm tree.

Just a contextual overlap.  I fixed it up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/