From: Anthony Liguori Date: Mon, 12 Aug 2013 13:28:56 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2aa09da823c258b3636d0e73527510cd196c68e4;p=qemu.git Merge remote-tracking branch 'origin/master' into staging * origin/master: mips: revert commit b332d24a8e1290954029814d09156b06ede358e2 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 --- 2aa09da823c258b3636d0e73527510cd196c68e4