| commit | c924f36a300cbc54d3cb511116e8e2bae17f5ae6 | |
| author | Michael S. Tsirkin <mst@redhat.com> | |
| Wed, 1 Dec 2010 05:11:51 +0000 (1 07:11 +0200) | ||
| committer | Michael S. Tsirkin <mst@redhat.com> | |
| Wed, 1 Dec 2010 05:11:51 +0000 (1 07:11 +0200) | ||
| tree | 04e57676b1db1db7d8b33934b349f8f37780fa2a | treesnapshot (tar.gz zip) |
| parent | 1abeb5a65d515f8a8a9cfc4a82342f731bd9321f | commitdiff |
| parent | 09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2 | commitdiff |
Merge remote branch 'origin/master' into pci
Conflicts:
Makefile.objs
hw/virtio.c
Conflicts:
Makefile.objs
hw/virtio.c
| Makefile | diff1 | diff2 | blobhistory |
| Makefile.objs | diff1 | diff2 | blobhistory |
| hw/e1000.c | diff1 | diff2 | blobhistory |
| hw/ide/via.c | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |