]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4dabf9 25a1181)
Merge remote-tracking branch 'agraf/xen-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 13:04:35 +0000 (08:04 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 13:04:35 +0000 (08:04 -0500)
1  2 
trace-events patch | diff1 | diff2 | blob | history

diff --cc trace-events
Simple merge
Qemu copy for testing