diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-31 08:20:56 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-31 08:20:56 -0500 |
| commit | ed7ec8400707fe42f4a0f40db2f2d5827ecea789 (patch) | |
| tree | ac947988c1bab49f74d7617b31e16db2a1637a6a /ppc-dis.c | |
| parent | f590f4c4b6b1adcbcec1780f85466ea10c8c6123 (diff) | |
| parent | 1455084ea2c48abf23c4e4e15e378ee43457f381 (diff) | |
Merge remote-tracking branch 'bonzini/scsi.2' into staging
Conflicts:
hw/usb-msd.c
Diffstat (limited to 'ppc-dis.c')
0 files changed, 0 insertions, 0 deletions