summaryrefslogtreecommitdiff
path: root/drivers/base/dd.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-07 04:17:17 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-07 04:17:17 +0300
commitd89d7ff9edf58cbf8ad0f490694b2edea8eb3a39 (patch)
tree4fc5789486ca9ee0dad37c5fbee330d1484a2d58 /drivers/base/dd.c
parent7b06a6d7bff563d82ddf8769617632f26793a83e (diff)
parent013c074f8642d8e815ad670601f8e27155a74b57 (diff)
parent5de85b9d57aba3ed2e04759e6db3b9e826dd0b06 (diff)
downloadlinux-d89d7ff9edf58cbf8ad0f490694b2edea8eb3a39.tar.xz
Merge branches 'pm-sleep' and 'pm-runtime' into pm-core