summaryrefslogtreecommitdiff
path: root/kernel/power/process.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2021-06-30 21:27:32 +0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2021-06-30 21:27:32 +0300
commit857286e4c5ae5d2e860fd15d4628e707b434d7e5 (patch)
tree520ea5916f50fb2a4289d8d70438d559c6808b01 /kernel/power/process.c
parent51f382428c17f172f430f9be8de4246b8f15f97c (diff)
parent007b350a58754a93ca9fe50c498cc27780171153 (diff)
downloadlinux-857286e4c5ae5d2e860fd15d4628e707b434d7e5.tar.xz
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'kernel/power/process.c')
-rw-r--r--kernel/power/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 50cc63534486..37401c99b7d7 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * drivers/power/process.c - Functions for starting/stopping processes on
+ * drivers/power/process.c - Functions for starting/stopping processes on
* suspend transitions.
*
* Originally from swsusp.