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)
Merge MIPS patches destined to both 4.7 and kvm/next, to avoid
unnecessary conflicts.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Trivial merge