From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Mon, 30 Jan 2017 10:19:20 +0000 (+0100)
Subject: Merge tag 'kvm-s390-master-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.11-rc1~109^2~41^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=af0f339a6c18468421a67f361a60f14bc5144345;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'kvm-s390-master-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext

avoid merge conflicts, pull update for master
also into next.
---

af0f339a6c18468421a67f361a60f14bc5144345