| commit | bdfbc96b5809320e8f5d31fce06db9524c884d8a | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 15 Oct 2009 17:07:46 +0000 (15 18:07 +0100) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 15 Oct 2009 17:07:53 +0000 (15 18:07 +0100) | ||
| tree | f75de5e35a9c9200d65e51b29d5ac4cbcc935dca | treesnapshot (tar.gz zip) |
| parent | e7e5448ba387adc20be1cf08411a5b526d684299 | commitdiff |
| parent | dea7b3b95a0e6b88e0647e7afc8b6a7b5675fbb1 | commitdiff |
Merge commit 'dea7b3b95a0e6b88e0647e7afc8b6a7b5675fbb1' into upstream-merge
* commit 'dea7b3b95a0e6b88e0647e7afc8b6a7b5675fbb1':
net: remove id field from NICInfo
net: handle id= parameter for -net
net: remove unused qemu_handler_true()
net: pass monitor handle to client init functions
hotplug: safely iterate bus's sibling list while removing a device
eepro100: Remove unused device status entries
winwave: ADC support
audio: remove last remnants of _t
winwave: make error logging more consistent
winwave: follow the rules when closing the output device
configure: clean temporary executable files even on Windows
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* commit 'dea7b3b95a0e6b88e0647e7afc8b6a7b5675fbb1':
net: remove id field from NICInfo
net: handle id= parameter for -net
net: remove unused qemu_handler_true()
net: pass monitor handle to client init functions
hotplug: safely iterate bus's sibling list while removing a device
eepro100: Remove unused device status entries
winwave: ADC support
audio: remove last remnants of _t
winwave: make error logging more consistent
winwave: follow the rules when closing the output device
configure: clean temporary executable files even on Windows
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| configure | diff1 | diff2 | blobhistory |
| hw/acpi.c | diff1 | diff2 | blobhistory |
| hw/pci.c | diff1 | diff2 | blobhistory |
| net.c | diff1 | diff2 | blobhistory |
| net.h | diff1 | diff2 | blobhistory |