git.samba.org / jlayton / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bead2a 0447819)
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)
avoid merge conflicts, pull update for master
also into next.

1  2 
arch/s390/kvm/kvm-s390.c patch | diff1 | diff2 | blob | history

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge
Jeff Layton's Linux Kernel Tree