Merge remote branch 'origin/master' into pci

Conflicts:
	Makefile.objs
	hw/virtio.c

diff --cc Makefile
index 2883d27f252358be7082897fee9a67cfb00f0231,d3bc0f2c747663a21c4b07a5fa0ed3cd435d4667..c80566c76d6911334ae89815ce10685488a3b359
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -178,9 -204,11 +204,10 @@@ ar      de     en-us  fi  fr-be  h
  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
  
  ifdef INSTALL_BLOBS
- BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
- openbios-sparc32 openbios-sparc64 openbios-ppc \
+ BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \
+ vgabios-stdvga.bin vgabios-vmware.bin \
+ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
  gpxe-eepro100-80861209.rom \
 -gpxe-eepro100-80861229.rom \
  pxe-e1000.bin \
  pxe-ne2k_pci.bin pxe-pcnet.bin \
  pxe-rtl8139.bin pxe-virtio.bin \

diff --cc Makefile.objs
index c5919af05499ec633727138db7152ec8522ffa4d,13ba26fdcb313f4689d1fabc5348967fdca7dd37..257623bce9911e507fafb0debcb15d66fde4520c
--- 1/Makefile.objs
--- 2/Makefile.objs
+++ b/Makefile.objs
@@@ -205,15 -215,15 +215,16 @@@ hw-obj-$(CONFIG_PPCE500_PCI) += ppce500
  hw-obj-$(CONFIG_PIIX4) += piix4.o
  
  # PCI watchdog devices
- hw-obj-y += wdt_i6300esb.o
+ hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
  
- hw-obj-y += pcie.o pcie_aer.o pcie_port.o
- hw-obj-y += msix.o msi.o
 -hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o
++hw-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
++hw-obj-$(CONFIG_PCI) += msix.o msi.o
  
  # PCI network cards
- hw-obj-y += ne2000.o
- hw-obj-y += eepro100.o
- hw-obj-y += pcnet.o
+ hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o
+ hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
+ hw-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o
+ hw-obj-$(CONFIG_PCNET_COMMON) += pcnet.o
  
  hw-obj-$(CONFIG_SMC91C111) += smc91c111.o
  hw-obj-$(CONFIG_LAN9118) += lan9118.o

diff --cc hw/e1000.c
Simple merge

diff --cc hw/ide/via.c
Simple merge

diff --cc vl.c
Simple merge