]> git.proxmox.com Git - qemu.git/commitdiff
Merge branch 's390-1.0' of git://repo.or.cz/qemu/agraf
authorJustin M. Forbes <jforbes@redhat.com>
Wed, 1 Feb 2012 17:25:23 +0000 (11:25 -0600)
committerJustin M. Forbes <jforbes@redhat.com>
Wed, 1 Feb 2012 17:25:23 +0000 (11:25 -0600)

Trivial merge