]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote branch 'linux-user/linux-user-for-upstream' into staging-tmp
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 8 Feb 2010 16:09:52 +0000 (10:09 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 8 Feb 2010 16:09:52 +0000 (10:09 -0600)

Trivial merge