diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
| commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
| tree | c7839809e35fce4868910742157e8ef96782b378 /net/rose/rose_dev.c | |
| parent | futex: Consolidate duplicated timer setup code (diff) | |
| parent | Linux 5.2-rc3 (diff) | |
| download | linux-26b73da3604cc1a6596406d136b14d1a01c3676f.tar.xz linux-26b73da3604cc1a6596406d136b14d1a01c3676f.zip | |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/rose/rose_dev.c')
| -rw-r--r-- | net/rose/rose_dev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c index 369ca81a8c5d..051804fbee17 100644 --- a/net/rose/rose_dev.c +++ b/net/rose/rose_dev.c @@ -1,8 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * 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. * * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) */ |