Merge our KVM topic branch, this has been independently included in linux-next
for most of the development cycle.