projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d946412
7de51eb
)
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
author
Anthony Liguori
<aliguori@us.ibm.com>
Thu, 12 May 2011 13:08:12 +0000
(08:08 -0500)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Thu, 12 May 2011 13:08:12 +0000
(08:08 -0500)
Conflicts:
cpu-all.h
1
2
cpu-exec.c
patch
|
diff1
|
diff2
|
blob
|
history
hw/pci.c
patch
|
diff1
|
diff2
|
blob
|
history
target-cris/cpu.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cpu-exec.c
Simple merge
diff --cc
hw/pci.c
Simple merge
diff --cc
target-cris/cpu.h
Simple merge
projects / sdk / emulator / qemu.git / commitdiff