git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74da4a0 13cfc73)
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)
commit8cd93850347bb4487d332d6638a22c7686ae237d
tree85b22746847e5690692245d5d3a5d2b0ea93dff5tree
parent74da4a0180fb2091802087764e67ac5e53667217commit | diff
parent13cfc732160f7bc7e596128ce34cda361c556966commit | 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
arch/x86/pci/fixup.c diff1 | diff2 | blob | history
drivers/pci/pci.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.