projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
961730a
fb212c0
)
Merge remote branch 'mst/for_anthony' into staging
author
Anthony Liguori
<aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:21:29 +0000
(08:21 -0600)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:21:29 +0000
(08:21 -0600)
1
2
Makefile.objs
patch
|
diff1
|
diff2
|
blob
|
history
hw/pci.c
patch
|
diff1
|
diff2
|
blob
|
history
hw/virtio-net.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile.objs
Simple merge
diff --cc
hw/pci.c
Simple merge
diff --cc
hw/virtio-net.c
Simple merge