]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdcf915 d154e0b)
Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Jul 2010 13:05:27 +0000 (08:05 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Jul 2010 13:05:27 +0000 (08:05 -0500)
1  2 
hw/e1000.c patch | diff1 | diff2 | blob | history

diff --cc hw/e1000.c
Simple merge
QEMU mirror