Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:10:49 +0000 (09:10 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:10:49 +0000 (09:10 -0600)
1  2 
hw/ide/core.c

diff --cc hw/ide/core.c
Simple merge