| commit | 9b5334e795e58ec26b8ea19c4c9b8174e92008f5 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Sun, 18 Oct 2009 03:40:20 +0000 (18 01:40 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Sun, 18 Oct 2009 03:40:20 +0000 (18 01:40 -0200) | ||
| tree | 8b96d062ac93e8866309c1b3b7ac63de25a18a80 | treesnapshot (tar.gz zip) |
| parent | 3c620108aae0f1e7f8b06f04275e9bdc2d6f46f6 | commitdiff |
| parent | ccb167e9d7d460a7cd09fdabd848efd3606dd27e | commitdiff |
Merge commit 'ccb167e9d7d460a7cd09fdabd848efd3606dd27e' into upstream-merge
* commit 'ccb167e9d7d460a7cd09fdabd848efd3606dd27e':
ksm support
pcnet: Extend hardware reset
qcow2: Bring synchronous read/write back to life
Documentation: Move msmouse description to an appropriate place
Documentation: Add missing tags to placeholders
Documentation: Highlight placeholders in suboptions
net: fix multiple NICs causing net opts process to stop
Conflicts:
exec.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'ccb167e9d7d460a7cd09fdabd848efd3606dd27e':
ksm support
pcnet: Extend hardware reset
qcow2: Bring synchronous read/write back to life
Documentation: Move msmouse description to an appropriate place
Documentation: Add missing tags to placeholders
Documentation: Highlight placeholders in suboptions
net: fix multiple NICs causing net opts process to stop
Conflicts:
exec.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| net.c | diff1 | diff2 | blobhistory |
| qemu-options.hx | diff1 | diff2 | blobhistory |