]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f4bd6b d5c8cf9)
Merge branch 'omap-for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm...
authorEdgar E. Iglesias <edgar.iglesias@gmail.com>
Mon, 29 Aug 2011 21:59:06 +0000 (23:59 +0200)
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>
Mon, 29 Aug 2011 21:59:06 +0000 (23:59 +0200)

Trivial merge
Qemu copy for testing