diff options
author | 2018-03-08 11:07:30 -0800 | |
---|---|---|
committer | 2018-03-08 11:07:30 -0800 | |
commit | c6380ecd8e9bee7aba3d9a5a94b58168244c4a61 (patch) | |
tree | f8d9522c66e805f638399e094f8e0dfd92584d06 /fs/jbd2/commit.c | |
parent | Input: synaptics - handle errors from input_mt_init_slots() (diff) | |
parent | Linux 4.16-rc4 (diff) | |
download | wireguard-linux-c6380ecd8e9bee7aba3d9a5a94b58168244c4a61.tar.xz wireguard-linux-c6380ecd8e9bee7aba3d9a5a94b58168244c4a61.zip |
Merge tag 'v4.16-rc4' into next
Sync up with mainline to bring in RAVE MFD device core.
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r-- | fs/jbd2/commit.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 3c1c31321d9b..8de0e7723316 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * linux/fs/jbd2/commit.c * @@ -5,10 +6,6 @@ * * Copyright 1998 Red Hat corp --- All Rights Reserved * - * This file is part of the Linux kernel and is made available under - * the terms of the GNU General Public License, version 2, or at your - * option, any later version, incorporated herein by reference. - * * Journal commit routines for the generic filesystem journaling code; * part of the ext2fs journaling system. */ |