Merge branch 'sthyi' into features

Add the store-hypervisor-information code into features
using a tip branch for parallel merging into the KVM tree.

diff --cc arch/s390/include/asm/sysinfo.h
Simple merge

diff --cc arch/s390/kernel/Makefile
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge