projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01e7a53 07f3507)
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)
1  2 
hw/dp8393x.c patch | diff1 | diff2 | blob | history
target-sh4/helper.c patch | diff1 | diff2 | blob | history

diff --cc hw/dp8393x.c
Simple merge
diff --cc target-sh4/helper.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.