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

diff --cc block/qed.c
Simple merge
diff --cc block/vmdk.c
Simple merge