diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-25 17:57:46 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-25 17:57:46 +0200 |
commit | 8b485ba12b0defa0c4ed3559789250238f8331a8 (patch) | |
tree | a1174810bef0d504370272918dca8d485ae2ae3b /arch/arm/include/asm/arch-mx5/spl.h | |
parent | 12607adcd5181a8f6eab885a5fe4ba2fa12ef92a (diff) | |
parent | aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (diff) | |
download | u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.zip u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.gz u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.bz2 |
Merge branch 'u-boot/master' into u-boot-arm/master
Diffstat (limited to 'arch/arm/include/asm/arch-mx5/spl.h')
-rw-r--r-- | arch/arm/include/asm/arch-mx5/spl.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/include/asm/arch-mx5/spl.h b/arch/arm/include/asm/arch-mx5/spl.h index e0b6e3e..20c6cae 100644 --- a/arch/arm/include/asm/arch-mx5/spl.h +++ b/arch/arm/include/asm/arch-mx5/spl.h @@ -1,13 +1,7 @@ /* * Copyright (C) 2013 Marek Vasut <marex@denx.de> * - * See file CREDITS for list of people who contributed to this - * project. - * - * 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. + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARCH_SPL_H__ |