Merge remote-tracking branch 'kwolf/for-anthony' into staging
commit2a22e6eb1b516a16ed2dd6c15da9a1e5b3455371
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 17:36:50 +0000 (14 12:36 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 17:36:50 +0000 (14 12:36 -0500)
tree25929b08103e952a07a6bfb4f6676ab957b835e0
parent210b3a70383b0bcc4266856431491b39dcb4f14d
parent09f085d59dcca7cccc76a22ad4e5cc70e3ff2bdd
Merge remote-tracking branch 'kwolf/for-anthony' into staging
hw/ide/core.c