| commit | 8aac025b308ea1b9a59571934454802facacdb2b | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Fri, 3 Oct 2014 13:53:20 +0000 (3 15:53 +0200) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Fri, 3 Oct 2014 13:53:20 +0000 (3 15:53 +0200) | ||
| tree | c79d14e74cf62cb64287a492e7011796987b7e0a | treesnapshot (tar.gz zip) |
| parent | ba53fde98631f0dc2545c8fcd82063f8b81772db | commitdiff |
| parent | 769188d3bbf95ce8d96a335624234dad083f4db6 | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
async.c
API fixes were needed for fvd.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
async.c
API fixes were needed for fvd.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
25 files changed: