]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 12:43:51 +0000 (07:43 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 12:43:51 +0000 (07:43 -0500)

Trivial merge