| commit | ac20d44b2e58195217467d1ed693022600000bee | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 11 Jun 2009 09:31:20 +0000 (11 10:31 +0100) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 11 Jun 2009 09:31:20 +0000 (11 10:31 +0100) | ||
| tree | a278c8a6df9cc1daa40ccae4d47302e7be59acf5 | treesnapshot (tar.gz zip) |
| parent | 5ce1ef2fdc46694a2ff1ffddf5ff9568a420c4ba | commitdiff |
| parent | 4ca1a9c62af1b98a359254546cd8e9999c892670 | commitdiff |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (7 commits)
Fix generation of CONFIG_KVM
Use hxtool for qemu-img command list
doc: Update information on supported network adapters.
xen: net backend doesn't need linux headers.
Document changes in qemu-img interface
qemu-img: Print available options with -o ?
Fix spelling in comment.
Conflicts:
configure
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* 'master' of git://git.sv.gnu.org/qemu: (7 commits)
Fix generation of CONFIG_KVM
Use hxtool for qemu-img command list
doc: Update information on supported network adapters.
xen: net backend doesn't need linux headers.
Document changes in qemu-img interface
qemu-img: Print available options with -o ?
Fix spelling in comment.
Conflicts:
configure
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |
| block/raw-posix.c | diff1 | diff2 | blobhistory |
| configure | diff1 | diff2 | blobhistory |