From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 26 Apr 2012 20:20:33 +0000 (-0500)
Subject: Merge remote-tracking branch 'mst/tags/for_anthony' into staging
X-Git-Tag: v1.1-rc0~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0677e2777e38dc967a0e879a508fb1e88fe6f98e;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'mst/tags/for_anthony' into staging

* mst/tags/for_anthony:
  e1000: set E1000_ICR_INT_ASSERTED only for 8257x
  e1000: link auto-negotiation emulation
  e1000: introduce bit for debugging PHY emulation
  e1000: introduce helpers to manipulate link status
  e1000: PHY loopback mode support
  e1000: conditionally raise irq at the end of MDI cycle
  e1000: introduce bits of PHY control register
  eepro100: Fix multicast regression
  virtio: order index/descriptor reads
  virtio: add missing mb() on enable notification
  virtio: add missing mb() on notification
  e1000: move reset function earlier in file
---

0677e2777e38dc967a0e879a508fb1e88fe6f98e