summaryrefslogtreecommitdiffstats
path: root/mm/memblock.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-06-26 12:39:34 +0100
committerMark Brown <broonie@kernel.org>2019-06-26 12:39:34 +0100
commit53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 (patch)
treecad53f42ce7a03c39a984bcdbcc42cd47f1af6f9 /mm/memblock.c
parente3303268f9cfa4eb7c2217df471417d4327109fd (diff)
parent4b972a01a7da614b4796475f933094751a295a2f (diff)
downloadtalos-op-linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.tar.gz
talos-op-linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.zip
Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
Diffstat (limited to 'mm/memblock.c')
-rw-r--r--mm/memblock.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index 6bbad46f4d2c..7d4f61ae666a 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Procedures for maintaining information about logical memory blocks.
*
* Peter Bergner, IBM Corp. June 2001.
* Copyright (C) 2001 Peter Bergner.
- *
- * 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.
*/
#include <linux/kernel.h>
OpenPOWER on IntegriCloud