diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 03:21:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 03:21:15 -0400 |
commit | 58ee01007c9e00531c1280b2d99b49d29a5e9844 (patch) | |
tree | d1feb7102591a811b4458e2e209d476580ae3687 /kernel/sched/debug.c | |
parent | 4850f26abfcac9ed28a4db5817b46dc0bfbbbae0 (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) |
Merge 5.2-rc6 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/sched/debug.c')
-rw-r--r-- | kernel/sched/debug.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 678bfb9bd87f..14c6a8716ba1 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c | |||
@@ -1,13 +1,10 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * kernel/sched/debug.c | 3 | * kernel/sched/debug.c |
3 | * | 4 | * |
4 | * Print the CFS rbtree and other debugging details | 5 | * Print the CFS rbtree and other debugging details |
5 | * | 6 | * |
6 | * Copyright(C) 2007, Red Hat, Inc., Ingo Molnar | 7 | * Copyright(C) 2007, Red Hat, Inc., Ingo Molnar |
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | 8 | */ |
12 | #include "sched.h" | 9 | #include "sched.h" |
13 | 10 | ||