]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'agraf/xen-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:07:55 +0000 (07:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:07:55 +0000 (07:07 -0500)

Trivial merge