Merge commit '45fe15c25a5c9feea6e0f78434f5e9f632de9d94' into upstream-merge

Merge commit '45fe15c25a5c9feea6e0f78434f5e9f632de9d94' into upstream-merge

* commit '45fe15c25a5c9feea6e0f78434f5e9f632de9d94': (25 commits)
  MSI: Robust resource release
  eepro100: Support 32 bit read/write access to flash register
  eepro100: Support byte read access to general control register
  eepro100: Support byte/word read/write access to MDI control register
  eepro100: Support byte/word writes to pointer register
  eepro100: Support byte/word writes to port address
  eepro100: Fix endianness issues
  eepro100: Pad received short frames
  eepro100: Remove unused structure element
  eepro100: Remove type casts which are no longer needed
  eepro100: Avoid duplicate debug messages
  wdt_i6300esb: convert to pci_register_bar_simple()
  usb-ohci: convert to pci_register_bar_simple()
  pcnet-pci: convert to pci_register_bar_simple()
  ich/ahci: convert to pci_register_bar_simple()
  hda-intel: convert to pci_register_bar_simple() (partial)
  hda-intel: convert to pci_register_bar_simple()
  eepro100: convert to pci_register_bar_simple()
  cirrus-vga: convert to pci_register_bar_simple()
  rtl8139: convert to pci_register_bar_simple()
  ...

Conflicts:
	hw/msi.c

Signed-off-by: Avi Kivity <avi@redhat.com>