Merge remote branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 5 Oct 2010 18:54:49 +0000 (13:54 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 5 Oct 2010 18:54:49 +0000 (13:54 -0500)
commita42acd0c976bfa89030a9bb7af6d5838e69f01bb
treecc99327c9a0d496ed0c400a31c919b517f9d09f4
parent4f42f81c332b7947dbc6259dffd2c61b083ba656
parent63c6bdac82f4af97293c895403df68bc9756d9d9
Merge remote branch 'qmp/for-anthony' into staging
Makefile
Makefile.target
monitor.c
monitor.h
qjson.h