]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 8 May 2012 14:41:10 +0000 (09:41 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 8 May 2012 14:41:10 +0000 (09:41 -0500)
commit4f08129eeb42422655cc946a0a0c3accc2b8e3db
tree3c9a4585181d7543fd6d272604e41e15270e07a0
parent7c652c1eaf20b9271ebcc92b788d1fe656b3a774
parentbdc62e62ead1a6c2a113934bf28cb5abef48618d
Merge remote-tracking branch 'mst/tags/for_anthony' into staging

* mst/tags/for_anthony:
  rtl8139: fix regression in TxStatus/TxAddr read