diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:00:22 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:00:22 +0200 |
commit | 7b347ad4938ddca1a22b983e36b9ef825a72d230 (patch) | |
tree | 93b6262da516cda28465a8dc0c4a6a95525cbbd8 /fs/ocfs2/export.h | |
parent | 9db9b76767f133d0e1ce19f01117c83221641899 (diff) | |
parent | 9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff) | |
download | talos-op-linux-7b347ad4938ddca1a22b983e36b9ef825a72d230.tar.gz talos-op-linux-7b347ad4938ddca1a22b983e36b9ef825a72d230.zip |
Merge tag 'v5.2-rc5' into x86/asm, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ocfs2/export.h')
-rw-r--r-- | fs/ocfs2/export.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/fs/ocfs2/export.h b/fs/ocfs2/export.h index 41a738678c37..d485da0c3439 100644 --- a/fs/ocfs2/export.h +++ b/fs/ocfs2/export.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* -*- mode: c; c-basic-offset: 8; -*- * vim: noexpandtab sw=8 ts=8 sts=0: * @@ -6,21 +7,6 @@ * Function prototypes * * Copyright (C) 2002, 2005 Oracle. All rights reserved. - * - * 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. */ #ifndef OCFS2_EXPORT_H |