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 /drivers/vme/boards/vme_vmivme7805.h | |
| parent | Merge tag 'drm-misc-next-2019-06-14' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.tar.xz 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 'drivers/vme/boards/vme_vmivme7805.h')
| -rw-r--r-- | drivers/vme/boards/vme_vmivme7805.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/vme/boards/vme_vmivme7805.h b/drivers/vme/boards/vme_vmivme7805.h index 44c2c449808c..c2c5e3053d3f 100644 --- a/drivers/vme/boards/vme_vmivme7805.h +++ b/drivers/vme/boards/vme_vmivme7805.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * vmivme_7805.h * @@ -5,11 +6,6 @@ * * Author: Arthur Benilov <arthur.benilov@iba-group.com> * Copyright 2010 Ion Beam Application, Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. */ |