| commit | cb19757a620d61bee6fbef0519fde58986b9e877 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Fri, 20 Mar 2015 19:35:46 +0000 (20 20:35 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Fri, 20 Mar 2015 19:35:46 +0000 (20 20:35 +0100) | ||
| tree | e0beae81307409a019a6c3d056d785e54ee979fe | treesnapshot (tar.gz zip) |
| parent | c4b70f454176103dfc6d321ed11a19c49bfa99cd | commitdiff |
| parent | 3e5f6234b4f45a11b7c357dde2d6da36641bc6f6 | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
target-moxie/mmu.h
ui/vnc.c
user-exec.c
Fix also API for ar7.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
target-moxie/mmu.h
ui/vnc.c
user-exec.c
Fix also API for ar7.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
34 files changed: