Merge remote-tracking branch 'aneesh/for-upstream-6' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 20 Oct 2011 13:42:08 +0000 (08:42 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 20 Oct 2011 13:42:08 +0000 (08:42 -0500)
commit7c0a4bd0e49aed30431e9752d4ab09720381fb6e
treedeec2cb0dbebe1e6295b7068c85cdf181a378599
parent5c05133cdce92622357eeed83e9b63db53b56be7
parenta7dde6b0cbc2eb6032997f02691ebe468290040e
Merge remote-tracking branch 'aneesh/for-upstream-6' into staging

Conflicts:
trace-events
Makefile.objs
qemu-options.hx
trace-events
vl.c