]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1633b39 c7b5a4e)
Merge branch 'pm-pci'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Jul 2017 11:15:49 +0000 (13:15 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Jul 2017 11:15:49 +0000 (13:15 +0200)
* pm-pci:
  PCI / PM: Fix native PME handling during system suspend/resume
  PCI / PM: Restore PME Enable after config space restoration

1  2 
drivers/pci/pci-driver.c patch | diff1 | diff2 | blob | history
drivers/pci/pci.c patch | diff1 | diff2 | blob | history
drivers/pci/pci.h patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci-driver.c
Simple merge
diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/pci.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.