projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41ef56e 1a39685)
Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 3 Jun 2010 19:55:49 +0000 (14:55 -0500)
committerAnthony 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
Domain: SDK / Emulator;