commit | fdba9594df8eb2e2ac16bba95308e4159ffbb9e4 | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Wed Jun 22 07:11:09 2011 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Wed Jun 22 07:11:09 2011 -0500 |
tree | ae99a704abd1629e8f0a2de427814ad48bc85197 | |
parent | 7ee28fd303003d70bb4c142e6ad4b92b7383b5b4 [diff] | |
parent | 0e6264db2c04dfad79be60240bfacfcaf47f9d6c [diff] |
Merge remote-tracking branch 'mst/for_anthony' into staging Conflicts: hw/usb-uhci.c