]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pci/resource' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sun, 2 Jul 2017 23:49:49 +0000 (18:49 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Sun, 2 Jul 2017 23:49:49 +0000 (18:49 -0500)
commit6b5e23da7b2a2e61a933d08bdc23ce38dd720f63
tree85b22746847e5690692245d5d3a5d2b0ea93dff5
parent94d35fdce92d3313353027ee49300dd458145056
parent0a65674c4d89309337e71595ab70c093b79e56f3
Merge branch 'pci/resource' into next

* pci/resource:
  PCI: Work around poweroff & suspend-to-RAM issue on Macbook Pro 11
  PCI: Do not disregard parent resources starting at 0x0

Conflicts:
arch/x86/pci/fixup.c
arch/x86/pci/fixup.c
drivers/pci/pci.c