diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-06-19 12:04:55 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-06-19 12:07:29 +0200 |
| commit | 52d2d44eee8091e740d0d275df1311fb8373c9a9 (patch) | |
| tree | 4aff282e84b3469f18cf9717490b892f6f39198f /scripts/sortextable.h | |
| parent | 2454fcea338ad821a39d471bc7db5a58ba41b742 (diff) | |
| parent | 9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff) | |
| download | linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.tar.gz linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.tar.bz2 linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.zip | |
Merge v5.2-rc5 into drm-next
Maarten needs -rc4 backmerged so he can pull in the fbcon notifier
removal topic branch into drm-misc-next.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'scripts/sortextable.h')
| -rw-r--r-- | scripts/sortextable.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/sortextable.h b/scripts/sortextable.h index ba8700428e21..d4b3f6c40f02 100644 --- a/scripts/sortextable.h +++ b/scripts/sortextable.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * sortextable.h * @@ -7,9 +8,6 @@ * * Copyright 2009 John F. Reiser <jreiser@BitWagon.com>. All rights reserved. * Copyright 2010 Steven Rostedt <srostedt@redhat.com>, Red Hat Inc. - * - * - * Licensed under the GNU General Public License, version 2 (GPLv2). */ #undef extable_ent_size |