diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-02-16 15:47:43 -0500 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-02-16 15:47:43 -0500 |
| commit | d4da404f36b24b089d20db1fb27d8f99cb66f409 (patch) | |
| tree | 349c4b792281826652eb9e6d7a46ed6622dc90de /include/linux/kobject.h | |
| parent | fa4127c5eb8def998fd8a471d51a4f2560dea0a2 (diff) | |
| parent | 933519a5a269d8460450545adefcb5caec622cac (diff) | |
Merge airlied/drm-next into drm-misc-next
Backmerge 4.15 and hdcp topic branch
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 3 |
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. |