diff options
| author | Stefano Babic <sbabic@denx.de> | 2013-07-31 11:30:38 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-07-31 11:30:38 +0200 |
| commit | 326ea986ac150acdc7656d57fca647db80b50158 (patch) | |
| tree | 15724288b8b6da3a98d934db8330bb964cdfdf36 /include/configs/o2dnt2.h | |
| parent | 4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff) | |
| parent | fdce7b633a1de24456226b18527cc7900c34282a (diff) | |
| download | u-boot-imx-326ea986ac150acdc7656d57fca647db80b50158.zip u-boot-imx-326ea986ac150acdc7656d57fca647db80b50158.tar.gz u-boot-imx-326ea986ac150acdc7656d57fca647db80b50158.tar.bz2 | |
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 'include/configs/o2dnt2.h')
| -rw-r--r-- | include/configs/o2dnt2.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/configs/o2dnt2.h b/include/configs/o2dnt2.h index c766acf..3636c0e 100644 --- a/include/configs/o2dnt2.h +++ b/include/configs/o2dnt2.h @@ -2,10 +2,7 @@ * (C) Copyright 2012 * DENX Software Engineering, Anatolij Gustschin <agust@denx.de> * - * 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+ */ /* |