diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2019-06-14 14:18:53 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2019-06-14 14:18:53 -0600 |
| commit | 8afecfb0ec961e37e61b2d19c4fa71617a9482de (patch) | |
| tree | c43ea51a47b1e76b762caa4c1b0c356249e5e874 /drivers/misc/phantom.c | |
| parent | ce1a5ea18ef9bf4c62c75abe7c540a29264ec988 (diff) | |
| parent | d1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff) | |
Merge tag 'v5.2-rc4' into mauro
We need to pick up post-rc1 changes to various document files so they don't
get lost in Mauro's massive RST conversion push.
Diffstat (limited to 'drivers/misc/phantom.c')
| -rw-r--r-- | drivers/misc/phantom.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c index b084245f6238e..6a5ed0e25ff13 100644 --- a/drivers/misc/phantom.c +++ b/drivers/misc/phantom.c @@ -1,11 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2005-2007 Jiri Slaby <jirislaby@gmail.com> * - * 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. - * * You need a userspace library to cooperate with this driver. It (and other * info) may be obtained here: * http://www.fi.muni.cz/~xslaby/phantom.html |