]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 868aa38 7ec7f28)
Merge branch 'for-upstream-0.15' of git://git.linaro.org/people/pmaydell/qemu-arm
authorJustin M. Forbes <jforbes@redhat.com>
Fri, 29 Jul 2011 15:14:01 +0000 (10:14 -0500)
committerJustin M. Forbes <jforbes@redhat.com>
Fri, 29 Jul 2011 15:14:01 +0000 (10:14 -0500)

Trivial merge
Qemu copy for testing