aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/windfarm_core.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-03 10:50:21 +0200
committerThomas Gleixner <tglx@linutronix.de>2019-07-03 10:50:21 +0200
commit341924049558e5f7c1a148a2c461a417933d35d9 (patch)
tree1340b4f2131737ef4be63f18ee74cd73ad12cd3e /drivers/macintosh/windfarm_core.c
parenthrtimer: Use a bullet for the returns bullet list (diff)
parentMAINTAINERS: Fix Andy's surname and the directory entries of VDSO (diff)
downloadlinux-dev-341924049558e5f7c1a148a2c461a417933d35d9.tar.xz
linux-dev-341924049558e5f7c1a148a2c461a417933d35d9.zip
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'drivers/macintosh/windfarm_core.c')
-rw-r--r--drivers/macintosh/windfarm_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index 5e013d781a74..77612303841e 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Windfarm PowerMac thermal control. Core
*
* (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
* <benh@kernel.crashing.org>
*
- * Released under the term of the GNU GPL v2.
- *
* This core code tracks the list of sensors & controls, register
* clients, and holds the kernel thread used for control.
*