Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git

# Conflicts:
#	drivers/virt/Kconfig
#	drivers/virt/Makefile