Merge remote-tracking branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:14:00 +0000 (07:14 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:14:00 +0000 (07:14 -0500)
1  2 
xen-all.c

diff --cc xen-all.c
Simple merge