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