projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b9734e 2e985fe)
Merge remote-tracking branch 'origin/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 12 Aug 2013 13:28:56 +0000 (08:28 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 12 Aug 2013 13:28:56 +0000 (08:28 -0500)
* 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 <aliguori@us.ibm.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.