diff options
| author | Dmitry Torokhov <[email protected]> | 2019-07-15 09:42:32 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2019-07-15 09:42:32 -0700 |
| commit | ecb41832bd2a7a3f8ac93527cec5e51e3827daed (patch) | |
| tree | a382a3719eca9ac8a22ae7f1715d0bd4843dc8e2 /include/linux/assoc_array.h | |
| parent | d38b6cf50a6b911ee46683330f3af17fcceca509 (diff) | |
| parent | 0ecfebd2b52404ae0c54a878c872bb93363ada36 (diff) | |
Merge tag 'v5.2' into next
Sync up with mainline to resolve conflicts in iforce driver.
Diffstat (limited to 'include/linux/assoc_array.h')
| -rw-r--r-- | include/linux/assoc_array.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/assoc_array.h b/include/linux/assoc_array.h index 65e3832f96b2..8b3f230ce894 100644 --- a/include/linux/assoc_array.h +++ b/include/linux/assoc_array.h @@ -1,14 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Generic associative array implementation. * * See Documentation/core-api/assoc_array.rst for information. * * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved. * Written by David Howells ([email protected]) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public Licence - * as published by the Free Software Foundation; either version - * 2 of the Licence, or (at your option) any later version. */ #ifndef _LINUX_ASSOC_ARRAY_H |