Merge remote-tracking branch 'origin/master' into staging

* origin/master:
  mips: revert commit b332d24a
  tcg/mips: fix invalid op definition errors

Necessary because patches got pushed by Aurelien before I pushed
the -rc2 tag.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>