Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/dmar.c

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 529d9d7727b0..999cc4088b59 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -151,6 +151,13 @@ void pci_bus_add_devices(struct pci_bus *bus)
                         if (retval)
                                 dev_err(&dev->dev, "Error creating cpuaffinity"
                                         " file, continuing...\n");
+
+                        retval = device_create_file(&child_bus->dev,
+                                                &dev_attr_cpulistaffinity);
+                        if (retval)
+                                dev_err(&dev->dev,
+                                        "Error creating cpulistaffinity"
+                                        " file, continuing...\n");
                 }
         }
 }