OSDN Git Service

Merge remote-tracking branch 'stefanha/tracing' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:29:46 +0000 (10:29 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:29:46 +0000 (10:29 -0500)

Trivial merge