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/mips/include/asm/u-boot-mips.h | |
| parent | 12607adcd5181a8f6eab885a5fe4ba2fa12ef92a (diff) | |
| parent | aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (diff) | |
| download | olio-uboot-2014.01-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.xz olio-uboot-2014.01-8b485ba12b0defa0c4ed3559789250238f8331a8.zip | |
Merge branch 'u-boot/master' into u-boot-arm/master
Diffstat (limited to 'arch/mips/include/asm/u-boot-mips.h')
| -rw-r--r-- | arch/mips/include/asm/u-boot-mips.h | 3 | 
1 files changed, 1 insertions, 2 deletions
| diff --git a/arch/mips/include/asm/u-boot-mips.h b/arch/mips/include/asm/u-boot-mips.h index e77636eaa..9f3cce9a6 100644 --- a/arch/mips/include/asm/u-boot-mips.h +++ b/arch/mips/include/asm/u-boot-mips.h @@ -1,6 +1,5 @@  /* - * This file is released under the terms of GPL v2 and any later version. - * See the file COPYING in the root directory of the source tree for details. + * SPDX-License-Identifier:	GPL-2.0+   *   * Copyright (C) 2003 Wolfgang Denk, DENX Software Engineering, wd@denx.de   */ |