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 /common/cmd_pxe.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 'common/cmd_pxe.c')
| -rw-r--r-- | common/cmd_pxe.c | 14 | 
1 files changed, 2 insertions, 12 deletions
| diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 1fb75d8ae..a2fb50ab9 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -1,19 +1,9 @@  /*   * Copyright 2010-2011 Calxeda, Inc.   * - * 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. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program.  If not, see <http://www.gnu.org/licenses/>. + * SPDX-License-Identifier:	GPL-2.0+   */ +  #include <common.h>  #include <command.h>  #include <malloc.h> |