| commit | a4673e276248ada38f40d39191a197e7e35d3f8b | |
| author | Anthony Liguori <aliguori@us.ibm.com> | |
| Mon, 14 Jun 2010 15:33:36 +0000 (14 10:33 -0500) | ||
| committer | Anthony Liguori <aliguori@us.ibm.com> | |
| Mon, 14 Jun 2010 15:33:36 +0000 (14 10:33 -0500) | ||
| tree | 4ecdac95fb7bb86eefc08ee38ca229c4d89e02e0 | treesnapshot (tar.gz zip) |
| parent | a2da0395c12bd2b26e2180d735c83988ff66a559 | commitdiff |
| parent | 653dbec7c97cb51d19636423902719e5850da265 | commitdiff |
Merge remote branch 'kwolf/for-anthony' into staging
Conflicts:
hw/pc.c
Conflicts:
hw/pc.c
| Makefile.objs | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |
| hw/qdev.c | diff1 | diff2 | blobhistory |
| monitor.c | diff1 | diff2 | blobhistory |
| sysemu.h | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |