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/powerpc/include/asm/trace_clock.h | |
parent | 1b961423158caaae49d3900b7c9c37477bbfa9b3 (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'arch/powerpc/include/asm/trace_clock.h')
-rw-r--r-- | arch/powerpc/include/asm/trace_clock.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/trace_clock.h b/arch/powerpc/include/asm/trace_clock.h index cf1ee75ca069..ef70c2f7974d 100644 --- a/arch/powerpc/include/asm/trace_clock.h +++ b/arch/powerpc/include/asm/trace_clock.h @@ -1,7 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* - * 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. * * Copyright (C) 2015 Naveen N. Rao, IBM Corporation */ |