Merge branch 'domains'

Conflicts:
	lib/pci.h

diff --cc lib/filter.c
Simple merge

diff --cc lib/internal.h
Simple merge

diff --cc lib/pci.h
index 6d904ddc39a9ea965feec687bc0956c680158315,545cefeb5d809afa9b8f8b47ad04bf5e47366661..47610f371e6c70141510e7681707f7748593e055
--- 1/lib/pci.h
--- 2/lib/pci.h
+++ b/lib/pci.h
@@@ -136,8 -136,7 +136,9 @@@ struct pci_dev 
    char *module_alias;                 /* Linux kernel module alias */
    char *label;                                /* Device name as exported by BIOS */
    int numa_node;                      /* NUMA node */
 +  pciaddr_t flags[6];                 /* PCI_IORESOURCE_* flags for regions */
 +  pciaddr_t rom_flags;                        /* PCI_IORESOURCE_* flags for expansion ROM */
+   int domain;                         /* 32-bit PCI domain (host bridge) */
  
    /* Fields used internally: */
    struct pci_access *access;

diff --cc lib/sysfs.c
Simple merge