]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge commit 'linux-user/linux-user-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 21 Oct 2009 18:36:49 +0000 (13:36 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 21 Oct 2009 18:36:49 +0000 (13:36 -0500)
1  2 
configure

diff --cc configure
Simple merge