]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c82dc29 b9cb88b)
Merge remote-tracking branch 'aneesh/for-upstream-3' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 13:52:59 +0000 (08:52 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 13:52:59 +0000 (08:52 -0500)
1  2 
hw/9pfs/virtio-9p.h patch | diff1 | diff2 | blob | history

diff --cc hw/9pfs/virtio-9p.h
Simple merge
Qemu copy for testing