diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
| commit | d2abae71ebcc409828b24ce9da402548ecdf1311 (patch) | |
| tree | 5edfafc2828d3bcebb3698520ccba374cd4328c0 /include/linux/memstick.h | |
| parent | 66567fcbaecac455caa1b13643155d686b51ce63 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/memstick.h')
| -rw-r--r-- | include/linux/memstick.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/memstick.h b/include/linux/memstick.h index 690c35a9d4cc..216a713bef7f 100644 --- a/include/linux/memstick.h +++ b/include/linux/memstick.h | |||
| @@ -1,12 +1,8 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
| 1 | /* | 2 | /* |
| 2 | * Sony MemoryStick support | 3 | * Sony MemoryStick support |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> | 5 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> |
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | */ | 6 | */ |
| 11 | 7 | ||
| 12 | #ifndef _MEMSTICK_H | 8 | #ifndef _MEMSTICK_H |