• Linus Torvalds's avatar
    Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · d73b3884
    Linus Torvalds authored
    * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI/PM: Report wakeup events before resuming devices
      PCI/PM: Use pm_wakeup_event() directly for reporting wakeup events
      PCI: sysfs: Update ROM to include default owner write access
      x86/PCI: make Broadcom CNB20LE driver EMBEDDED and EXPERIMENTAL
      x86/PCI: don't use native Broadcom CNB20LE driver when ACPI is available
      PCI/ACPI: Request _OSC control once for each root bridge (v3)
      PCI: enable pci=bfsort by default on future Dell systems
      PCI/PCIe: Clear Root PME Status bits early during system resume
      PCI: pci-stub: ignore zero-length id parameters
      x86/PCI: irq and pci_ids patch for Intel Patsburg
      PCI: Skip id checking if no id is passed
      PCI: fix __pci_device_probe kernel-doc warning
      PCI: make pci_restore_state return void
      PCI: Disable ASPM if BIOS asks us to
      PCI: Add mask bit definition for MSI-X table
      PCI: MSI: Move MSI-X entry definition to pci_regs.h
    
    Fix up trivial conflicts in drivers/net/{skge.c,sky2.c} that had in the
    meantime been converted to not use legacy PCI power management, and thus
    no longer use pci_restore_state() at all (and that caused trivial
    conflicts with the "make pci_restore_state return void" patch)
    d73b3884
rt2x00pci.c 8.5 KB