diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-10-26 15:36:22 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-10-26 15:38:02 +0200 |
| commit | 673652a785efb5f7da342b49c80a1abf033c82a7 (patch) | |
| tree | 2f277cce43b50e85cca36d7354ba2dd7ffd14d41 /pc-bios/s390-ccw | |
| parent | 856bd2c28e108ad0eb909bbbf3774f6f8bd7c2d4 (diff) | |
| parent | df84f17d1beabbb2aca39be18b21afc277cd6754 (diff) | |
Merge commit 'df84f17' into HEAD
This merge fixes a semantic conflict with the trivial tree.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'pc-bios/s390-ccw')
0 files changed, 0 insertions, 0 deletions