Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
[platform/kernel/linux-arm64.git] / drivers / s390 / kvm /
drwxr-xr-x   ..
-rw-r--r-- 305 Makefile
-rw-r--r-- 11225 kvm_virtio.c