From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 10 Apr 2012 13:21:58 +0000 (-0500)
Subject: Merge commit 'ff71f2e8cacefae99179993204172bc65e4303df' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4e1957acc854b2f3f3068c75cef2a429f9b97011;p=qemu.git

Merge commit 'ff71f2e8cacefae99179993204172bc65e4303df' into staging

* commit 'ff71f2e8cacefae99179993204172bc65e4303df': (21 commits)
  rtl8139: do the network/host communication only in normal operating mode
  rtl8139: correctly check the opmode
  net: move compute_mcast_idx() to net.h
  rtl8139: support byte read to TxStatus registers
  rtl8139: remove unused marco
  rtl8139: limit transmission buffer size in c+ mode
  pci_regs: Add PCI_EXP_TYPE_PCIE_BRIDGE
  virtio-net: add DATA_VALID flag
  pci_bridge: upper 32 bit are long registers
  pci: fix bridge IO/BASE
  pcie: drop functionality moved to core
  pci: set memory type for memory behind the bridge
  pci: add standard bridge device
  slotid: add slot id capability
  shpc: standard hot plug controller
  pci_bridge: user-friendly default bus name
  pci: make another unused extern function static
  pci: don't export an internal function
  pci_regs: Fix value of PCI_EXP_TYPE_RC_EC.
  pci: Do not check if a bus exist in pci_parse_devaddr.
  ...
---

4e1957acc854b2f3f3068c75cef2a429f9b97011