]> git.proxmox.com Git - mirror_qemu.git/commitdiff
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)
* mst/tags/for_anthony:
  rtl8139: fix regression in TxStatus/TxAddr read


Trivial merge