projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cac1e30 8b88827)
Merge remote-tracking branch 'aneesh/1.0-fixes' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 15:37:49 +0000 (09:37 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 15:37:49 +0000 (09:37 -0600)
1  2 
qerror.c patch | diff1 | diff2 | blob | history

diff --cc qerror.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.