Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm into HEAD

Here are the 3.13 KVM changes.  There was a lot of work on the PPC
side: the HV and emulation flavors can now coexist in a single kernel
is probably the most interesting change from a user point of view.
On the x86 side there are nested virtualization improvements and a
few bugfixes.  ARM got transparent huge page support, improved
overcommit, and support for big endian guests.

Finally, there is a new interface to connect KVM with VFIO.  This
helps with devices that use NoSnoop PCI transactions, letting the
driver in the guest execute WBINVD instructions.  This includes
some nVidia cards on Windows, that fail to start without these
patches and the corresponding userspace changes.

Conflicts:
	arch/powerpc/include/asm/processor.h
	arch/powerpc/kernel/ptrace.c
	arch/powerpc/kernel/traps.c