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:00:16 +0000 (11:00 +0200)
commit0699fdb380a847dcd4b74bbca6078bdb20033366
tree01d6a7f1436960273ea56ff86dd01257d672b82d
parentc1b8bfb08f25d1cb9ef2bc93229107113a41ad8c
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>