summaryrefslogtreecommitdiff
path: root/include/linux/kobject.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-02-11 11:33:33 +0100
committerIngo Molnar <mingo@kernel.org>2018-02-11 11:33:33 +0100
commit7980033bea8a74692fdb987c44ec91b0be8e752b (patch)
tree02b57329465d397b3a20468a683e56d1cda88cf6 /include/linux/kobject.h
parent3197b04bb39b596613ff2f8143c5cd0a6908debf (diff)
parentf1517df8701c9f12dae9ce7f43a5d300a6917619 (diff)
Merge branch 'linus' into x86/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kobject.h')
-rw-r--r--include/linux/kobject.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index e0a6205caa71..7f6f93c3df9c 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* kobject.h - generic kernel object infrastructure.
*
@@ -6,8 +7,6 @@
* Copyright (c) 2006-2008 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (c) 2006-2008 Novell Inc.
*
- * This file is released under the GPLv2.
- *
* Please read Documentation/kobject.txt before using the kobject
* interface, ESPECIALLY the parts about reference counts and object
* destructors.