diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-03 02:48:49 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-03 02:48:49 +0300 |
commit | 2cf816a947e0f729825a1bb73d2eed6255c29f88 (patch) | |
tree | 68cd933694029bd2f4a47973038ce0662ae47828 /drivers/video/fbdev/w100fb.c | |
parent | 6a1c1d553ebf4e4241c0b1e20517a67e36d46c12 (diff) | |
parent | 666ff6f83e1db6ed847abf44eb5e3402d82b9350 (diff) | |
download | linux-2cf816a947e0f729825a1bb73d2eed6255c29f88.tar.xz |
Merge branch 'pci/pm' into next
* pci/pm:
PCI/PM: Avoid using device_may_wakeup() for runtime PM
x86/PCI: Avoid AMD SB7xx EHCI USB wakeup defect
PCI/PM: Restore the status of PCI devices across hibernation
drm/radeon: make MacBook Pro d3_delay quirk more generic
drm/amdgpu: remove unnecessary save/restore of pdev->d3_delay
PCI/PM: Add needs_resume flag to avoid suspend complete optimization
PCI: imx6: Fix config read timeout handling
switchtec: Fix minor bug with partition ID register
switchtec: Use new cdev_device_add() helper function
PCI: endpoint: Make PCI_ENDPOINT depend on HAS_DMA
Diffstat (limited to 'drivers/video/fbdev/w100fb.c')
0 files changed, 0 insertions, 0 deletions