]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Oct 2011 13:09:02 +0000 (08:09 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Oct 2011 13:09:02 +0000 (08:09 -0500)
1  2 
Makefile

diff --cc Makefile
Simple merge