projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ddf83d0
50ced5b
)
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
author
Anthony Liguori
<aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:10:49 +0000
(09:10 -0600)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:10:49 +0000
(09:10 -0600)
1
2
hw/ide/core.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
hw/ide/core.c
Simple merge