diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
| commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
| tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /arch/arm/lib/delay-loop.S | |
| parent | 1b961423158caaae49d3900b7c9c37477bbfa9b3 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'arch/arm/lib/delay-loop.S')
| -rw-r--r-- | arch/arm/lib/delay-loop.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/lib/delay-loop.S b/arch/arm/lib/delay-loop.S index c766694e929c..3ccade0f8130 100644 --- a/arch/arm/lib/delay-loop.S +++ b/arch/arm/lib/delay-loop.S @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * linux/arch/arm/lib/delay.S * * Copyright (C) 1995, 1996 Russell King - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/linkage.h> #include <asm/assembler.h> |