Merge branch 'guarded-storage' into 'features' to make merging with
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 22 Mar 2017 07:22:02 +0000 (08:22 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 22 Mar 2017 07:22:02 +0000 (08:22 +0100)
the KVM tree easier.

1  2 
arch/s390/kernel/smp.c

Simple merge