projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
490a4ef
c0e5644
)
Merge remote branch 'kwolf/for-anthony' into staging
author
Anthony Liguori
<aliguori@us.ibm.com>
Thu, 3 Jun 2010 19:55:49 +0000
(14:55 -0500)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Thu, 3 Jun 2010 19:55:49 +0000
(14:55 -0500)
1
2
block.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
block.c
Simple merge