Merge branch 'pm-sleep' into pm-core
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 21 Oct 2017 11:09:18 +0000 (13:09 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 21 Oct 2017 11:09:18 +0000 (13:09 +0200)
commita2ab5fc41533c952706ebdfaa378bb746e535cc1
tree9fb86bb4e9ecb67f7e651d284c2f12c6c5d4378f
parenta380f2edef65b2447a043251bb3c00a9d2153a8b
parent0e708fc602531b8355b5de6ea7c98f09129b223f
Merge branch 'pm-sleep' into pm-core
include/linux/device.h