]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge tag 'kvm-s390-master-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorChristian Borntraeger <borntraeger@de.ibm.com>
Mon, 30 Jan 2017 10:19:20 +0000 (11:19 +0100)
committerChristian Borntraeger <borntraeger@de.ibm.com>
Mon, 30 Jan 2017 10:19:20 +0000 (11:19 +0100)
commitaf0f339a6c18468421a67f361a60f14bc5144345
tree2dc241fb2ce0617e98721a30c515538daf03fb1d
parent4bead2a423ea5268b0ab3cba058e215c65ee2cbd
parent04478197416e3a302e9ebc917ba1aa884ef9bfab
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.
arch/s390/kvm/kvm-s390.c