commit | b11c3f59475f4bb57b967642f362ea846302dab1 | [log] [tgz] |
---|---|---|
author | Paolo Bonzini <pbonzini@redhat.com> | Tue Jun 14 11:00:16 2016 +0200 |
committer | Paolo Bonzini <pbonzini@redhat.com> | Tue Jun 14 11:02:33 2016 +0200 |
tree | 38eb0dfb559e24e358e7f9b33727334a8c79b335 | |
parent | dca4d728773a2f48e999c8617524bbf8dee4807f [diff] | |
parent | 6df82a7b88dc9b0b519765562b005ef9196d812a [diff] |
Merge branch 'kvm-mips-fixes' into HEAD Merge MIPS patches destined to both 4.7 and kvm/next, to avoid unnecessary conflicts. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>