]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 957f1f9 dc804ab)
Merge remote-tracking branch 'pmaydell/armhw-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Sun, 21 Aug 2011 23:34:33 +0000 (18:34 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Sun, 21 Aug 2011 23:34:33 +0000 (18:34 -0500)
1  2 
hw/stellaris.c patch | diff1 | diff2 | blob | history

diff --cc hw/stellaris.c
Simple merge
QEMU mirror