]> git.baikalelectronics.ru Git - kernel.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)
commit47373a6ca58c0e48bb90e8662d3a9ad60883cbe1
tree2dc241fb2ce0617e98721a30c515538daf03fb1d
parent86e567c550bc6e3745319d1377b187446949f484
parent905c3db73f637c24c1ee279c1f99f03a2b4e4e05
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