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 PM: make the PM core more careful with drivers using the new PM framework PCI PM: Read power state from device after trying to change it on resume PCI PM: Do not disable and enable bridges during suspend-resume PCI: PCIe portdrv: Simplify suspend and resume PCI PM: Fix saving of device state in pci_legacy_suspend PCI PM: Check if the state has been saved before trying to restore it PCI PM: Fix handling of devices without drivers PCI: return error on failure to read PCI ROMs PCI: properly clean up ASPM link state on device remove
No related branches found
No related tags found
Showing
- Documentation/filesystems/sysfs-pci.txt 12 additions, 1 deletionDocumentation/filesystems/sysfs-pci.txt
- arch/ia64/sn/kernel/io_acpi_init.c 1 addition, 1 deletionarch/ia64/sn/kernel/io_acpi_init.c
- arch/ia64/sn/kernel/io_init.c 1 addition, 1 deletionarch/ia64/sn/kernel/io_init.c
- drivers/pci/pci-driver.c 105 additions, 59 deletionsdrivers/pci/pci-driver.c
- drivers/pci/pci-sysfs.c 2 additions, 2 deletionsdrivers/pci/pci-sysfs.c
- drivers/pci/pci.c 2 additions, 2 deletionsdrivers/pci/pci.c
- drivers/pci/pcie/aspm.c 2 additions, 2 deletionsdrivers/pci/pcie/aspm.c
- drivers/pci/pcie/portdrv_pci.c 1 addition, 15 deletionsdrivers/pci/pcie/portdrv_pci.c
- drivers/pci/rom.c 5 additions, 3 deletionsdrivers/pci/rom.c
- include/linux/pci.h 1 addition, 1 deletioninclude/linux/pci.h
Loading
Please register or sign in to comment