Merge commit 'fb23162885f7fd8cf7334bed22c25ac32c7d8b9d' into upstream-merge
commitca7da9280b38d376d65fcb03dcbc8fc04dc5c988
authorAvi Kivity <avi@redhat.com>
Sun, 22 Nov 2009 12:47:32 +0000 (22 14:47 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 22 Nov 2009 12:47:32 +0000 (22 14:47 +0200)
treede436d38b2c0bb9e8526ac1c1acc07fc557b5422
parent540e70e8ed423f80e721104ce9b7eb53822dd14b
parentfb23162885f7fd8cf7334bed22c25ac32c7d8b9d
Merge commit 'fb23162885f7fd8cf7334bed22c25ac32c7d8b9d' into upstream-merge

* commit 'fb23162885f7fd8cf7334bed22c25ac32c7d8b9d':
  pci: initialize pci config headers depending it pci header type.
  pci: teach pci_default_config_write() ROM bar for normal/bridge device .

Changed include order in hw/device-assignment.c.

Signed-off-by: Avi Kivity <avi@redhat.com>
hw/cirrus_vga.c
hw/device-assignment.c
hw/pci.c
hw/pci.h