Merge remote branch 'qemu-kvm/uq/master' into staging-tmp
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 8 Feb 2010 16:06:54 +0000 (10:06 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 8 Feb 2010 16:06:54 +0000 (10:06 -0600)
1  2 
exec.c
vl.c

diff --cc exec.c
Simple merge
diff --cc vl.c
Simple merge