diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-20 08:42:08 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-20 08:42:08 -0500 |
| commit | 1f99b94932fcf0a543e46e24875fc2b3a8c304a7 (patch) | |
| tree | deec2cb0dbebe1e6295b7068c85cdf181a378599 /block-migration.c | |
| parent | 8a9236f1d2e91ddd31e3eeae8fe27392c07324a9 (diff) | |
| parent | d9b36a6e562450fd633ea9352f43885b86693838 (diff) | |
| download | qemu-1f99b94932fcf0a543e46e24875fc2b3a8c304a7.tar.gz | |
Merge remote-tracking branch 'aneesh/for-upstream-6' into staging
Conflicts:
trace-events
Diffstat (limited to 'block-migration.c')
0 files changed, 0 insertions, 0 deletions