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 /board/freescale/common/ngpixis.c | |
| 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 'board/freescale/common/ngpixis.c')
| -rw-r--r-- | board/freescale/common/ngpixis.c | 5 | 
1 files changed, 1 insertions, 4 deletions
| diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c index 3c7502879..0cb076acc 100644 --- a/board/freescale/common/ngpixis.c +++ b/board/freescale/common/ngpixis.c @@ -2,10 +2,7 @@   * Copyright 2010-2011 Freescale Semiconductor   * Author: Timur Tabi <timur@freescale.com>   * - * 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+   *   * This file provides support for the ngPIXIS, a board-specific FPGA used on   * some Freescale reference boards. |