diff options
| author | Anthony Liguori | 2013-08-12 15:28:56 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-08-12 15:28:56 +0200 |
| commit | 2aa09da823c258b3636d0e73527510cd196c68e4 (patch) | |
| tree | 12b200fd4e1ee9262db9c5bfea2bdd573eb354e3 /include/exec | |
| parent | Update version for 1.6.0-rc2 (diff) | |
| parent | mips: revert commit b332d24a8e1290954029814d09156b06ede358e2 (diff) | |
| download | qemu-2aa09da823c258b3636d0e73527510cd196c68e4.tar.gz qemu-2aa09da823c258b3636d0e73527510cd196c68e4.tar.xz qemu-2aa09da823c258b3636d0e73527510cd196c68e4.zip | |
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 <aliguori@us.ibm.com>
Diffstat (limited to 'include/exec')
0 files changed, 0 insertions, 0 deletions