| commit | 8cd93850347bb4487d332d6638a22c7686ae237d | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Sun Jul 02 18:49:49 2017 -0500 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Sun Jul 02 18:49:49 2017 -0500 |
| tree | 85b22746847e5690692245d5d3a5d2b0ea93dff5 | |
| parent | 74da4a0180fb2091802087764e67ac5e53667217 [diff] | |
| parent | 13cfc732160f7bc7e596128ce34cda361c556966 [diff] |
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