Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: sysfs: fix printk warnings PCI: fix pci_bus_alloc_resource() hang, prefer positive decode PCI: read current power state at enable time PCI: fix size checks for mmap() on /proc/bus/pci files x86/PCI: coalesce overlapping host bridge windows PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area
Showing
- arch/x86/pci/acpi.c 83 additions, 20 deletionsarch/x86/pci/acpi.c
- drivers/pci/bus.c 49 additions, 21 deletionsdrivers/pci/bus.c
- drivers/pci/hotplug/ibmphp_ebda.c 6 additions, 0 deletionsdrivers/pci/hotplug/ibmphp_ebda.c
- drivers/pci/pci-sysfs.c 17 additions, 6 deletionsdrivers/pci/pci-sysfs.c
- drivers/pci/pci.c 12 additions, 0 deletionsdrivers/pci/pci.c
- drivers/pci/pci.h 6 additions, 1 deletiondrivers/pci/pci.h
- drivers/pci/proc.c 1 addition, 1 deletiondrivers/pci/proc.c
Loading
Please register or sign in to comment