| commit | ed7ec8400707fe42f4a0f40db2f2d5827ecea789 | |
| author | Anthony Liguori <aliguori@us.ibm.com> | |
| Tue, 31 May 2011 13:20:56 +0000 (31 08:20 -0500) | ||
| committer | Anthony Liguori <aliguori@us.ibm.com> | |
| Tue, 31 May 2011 13:20:56 +0000 (31 08:20 -0500) | ||
| tree | ac947988c1bab49f74d7617b31e16db2a1637a6a | treesnapshot (tar.gz zip) |
| parent | f590f4c4b6b1adcbcec1780f85466ea10c8c6123 | commitdiff |
| parent | 1455084ea2c48abf23c4e4e15e378ee43457f381 | commitdiff |
Merge remote-tracking branch 'bonzini/scsi.2' into staging
Conflicts:
hw/usb-msd.c
Conflicts:
hw/usb-msd.c
| hw/usb-msd.c | diff1 | diff2 | blobhistory |