Merge branch 'kvm-mips-fixes' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 14 Jun 2016 09:00:16 +0000 (11:00 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 14 Jun 2016 09:02:33 +0000 (11:02 +0200)
commitb11c3f59475f4bb57b967642f362ea846302dab1
tree38eb0dfb559e24e358e7f9b33727334a8c79b335
parentdca4d728773a2f48e999c8617524bbf8dee4807f
parent6df82a7b88dc9b0b519765562b005ef9196d812a
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>