diff options
| author | Stefano Babic <sbabic@denx.de> | 2013-07-31 09:30:38 (GMT) |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-07-31 09:30:38 (GMT) |
| commit | 326ea986ac150acdc7656d57fca647db80b50158 (patch) | |
| tree | 15724288b8b6da3a98d934db8330bb964cdfdf36 /common/cmd_mfsl.c | |
| parent | 4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff) | |
| parent | fdce7b633a1de24456226b18527cc7900c34282a (diff) | |
| download | u-boot-326ea986ac150acdc7656d57fca647db80b50158.tar.xz | |
Merge git://git.denx.de/u-boot-arm
Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'common/cmd_mfsl.c')
| -rw-r--r-- | common/cmd_mfsl.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c index ddf80d7..d735c9e 100644 --- a/common/cmd_mfsl.c +++ b/common/cmd_mfsl.c @@ -1,25 +1,9 @@ -/* - * (C) Copyright 2007 Michal Simek - * - * Michal SIMEK <monstr@monstr.eu> - * - * See file CREDITS for list of people who contributed to this +ve received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * 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. - * - * This program is distributed in the hope that 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, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0+ */ /* |