diff options
| author |   James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
| commit | 49e41801b335f64610bbfd23e8f2bbaf34d46276 (patch) | |
| tree | 4fbedacd1de1bbd4054f07f93031aebcb7b7a919 /Documentation/media/uapi/mediactl/request-func-close.rst | |
| parent | security: integrity: partial revert of make ima_main explicitly non-modular (diff) | |
| parent | Linux 5.0-rc1 (diff) | |
| download | linux-dev-49e41801b335f64610bbfd23e8f2bbaf34d46276.tar.xz linux-dev-49e41801b335f64610bbfd23e8f2bbaf34d46276.zip | |
Merge tag 'v5.0-rc1' into next-general
Linux 5.0-rc1
Sync to pick up LSM stacking work (which is based on -rc1).
Diffstat (limited to 'Documentation/media/uapi/mediactl/request-func-close.rst')
| -rw-r--r-- | Documentation/media/uapi/mediactl/request-func-close.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/media/uapi/mediactl/request-func-close.rst b/Documentation/media/uapi/mediactl/request-func-close.rst index dcf3f35bcf17..2cff7770558e 100644 --- a/Documentation/media/uapi/mediactl/request-func-close.rst +++ b/Documentation/media/uapi/mediactl/request-func-close.rst @@ -1,12 +1,12 @@ .. This file is dual-licensed: you can use it either under the terms -.. of the GPL or the GFDL 1.1+ license, at your option. Note that this +.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this .. dual licensing only applies to this file, and not this project as a .. whole. .. .. a) This file 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. +.. published by the Free Software Foundation version 2 of +.. the License. .. .. This file is distributed in the hope that it will be useful, .. but WITHOUT ANY WARRANTY; without even the implied warranty of |