diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:15 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:15 -0500 |
commit | 444dc48298c480e42e15a8fe676be737d8a6b2a1 (patch) | |
tree | bc76c5afaa746c8c27d0457e2035fe38ee45fb6c /qemu-objects.h | |
parent | 5b15f27516ce3249c80bd2e0458d8d61f20da415 (diff) | |
parent | 5f524c1ebcc5e0dec0de8940d34f9adb3c7887a1 (diff) |
Merge remote-tracking branch 'aneesh/for-upstream-2' into staging
Diffstat (limited to 'qemu-objects.h')
0 files changed, 0 insertions, 0 deletions