diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-10-04 08:23:03 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-10-04 08:23:03 +0200 |
commit | c0554d2d3db438623b4f2f9abc3d766b2b15d2fb (patch) | |
tree | d00dc324772b95373f4bdc566b3437e5bf637157 /fs/nilfs2/ifile.h | |
parent | bef459026b161fbc39d20dcba698ed0cfffbac38 (diff) | |
parent | 1d2ba7fee28b3a47cca8e8f4f94a22d30b2b3a6f (diff) | |
download | linux-stable-c0554d2d3db438623b4f2f9abc3d766b2b15d2fb.tar.gz linux-stable-c0554d2d3db438623b4f2f9abc3d766b2b15d2fb.tar.bz2 linux-stable-c0554d2d3db438623b4f2f9abc3d766b2b15d2fb.zip |
Merge branch 'linus' into x86/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nilfs2/ifile.h')
-rw-r--r-- | fs/nilfs2/ifile.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/nilfs2/ifile.h b/fs/nilfs2/ifile.h index 188b94fe0ec5..a1e1e5711a05 100644 --- a/fs/nilfs2/ifile.h +++ b/fs/nilfs2/ifile.h @@ -1,18 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * ifile.h - NILFS inode file * * Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation. * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * * Written by Amagai Yoshiji. * Revised by Ryusuke Konishi. * |