diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
commit | d2abae71ebcc409828b24ce9da402548ecdf1311 (patch) | |
tree | 5edfafc2828d3bcebb3698520ccba374cd4328c0 /include/linux/devfreq.h | |
parent | 66567fcbaecac455caa1b13643155d686b51ce63 (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) |
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/devfreq.h')
-rw-r--r-- | include/linux/devfreq.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index fbffa74bfc1b..2bae9ed3c783 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h | |||
@@ -1,13 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
1 | /* | 2 | /* |
2 | * devfreq: Generic Dynamic Voltage and Frequency Scaling (DVFS) Framework | 3 | * devfreq: Generic Dynamic Voltage and Frequency Scaling (DVFS) Framework |
3 | * for Non-CPU Devices. | 4 | * for Non-CPU Devices. |
4 | * | 5 | * |
5 | * Copyright (C) 2011 Samsung Electronics | 6 | * Copyright (C) 2011 Samsung Electronics |
6 | * MyungJoo Ham <myungjoo.ham@samsung.com> | 7 | * MyungJoo Ham <myungjoo.ham@samsung.com> |
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 | 9 | ||
13 | #ifndef __LINUX_DEVFREQ_H__ | 10 | #ifndef __LINUX_DEVFREQ_H__ |