Merge remote-tracking branch 'stefanha/trivial-patches' into staging
commit3a069ff11b9178a84f560435b2fd22294d839018
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 15:23:15 +0000 (31 10:23 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 15:23:15 +0000 (31 10:23 -0500)
treea5ffe92f5909b26fc77af69d7f5e05f1e20fe268
parentacba391493badb972db654fa1299052fce0379a3
parent3899edf7e4a13439793aaad21a17863a3b9152c2
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
block/qed.c
block/vmdk.c