diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
| commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
| tree | c7839809e35fce4868910742157e8ef96782b378 /kernel/ksysfs.c | |
| parent | 5ca584d935c32906d114924dc0e1dbfcbb13fdb2 (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/ksysfs.c')
| -rw-r--r-- | kernel/ksysfs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index 46ba853656f6..35859da8bd4f 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c | |||
| @@ -1,11 +1,9 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* | 2 | /* |
| 2 | * kernel/ksysfs.c - sysfs attributes in /sys/kernel, which | 3 | * kernel/ksysfs.c - sysfs attributes in /sys/kernel, which |
| 3 | * are not related to any other subsystem | 4 | * are not related to any other subsystem |
| 4 | * | 5 | * |
| 5 | * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org> | 6 | * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org> |
| 6 | * | ||
| 7 | * This file is release under the GPLv2 | ||
| 8 | * | ||
| 9 | */ | 7 | */ |
| 10 | 8 | ||
| 11 | #include <linux/kobject.h> | 9 | #include <linux/kobject.h> |