| commit | af0f339a6c18468421a67f361a60f14bc5144345 | [log] [tgz] |
|---|---|---|
| author | Christian Borntraeger <borntraeger@de.ibm.com> | Mon Jan 30 11:19:20 2017 +0100 |
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | Mon Jan 30 11:19:20 2017 +0100 |
| tree | 2dc241fb2ce0617e98721a30c515538daf03fb1d | |
| parent | 4bead2a423ea5268b0ab3cba058e215c65ee2cbd [diff] | |
| parent | 04478197416e3a302e9ebc917ba1aa884ef9bfab [diff] |
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.