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 /drivers/net/ftmac110.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 'drivers/net/ftmac110.c')
| -rw-r--r-- | drivers/net/ftmac110.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c index 579dcc7..e911dd3 100644 --- a/drivers/net/ftmac110.c +++ b/drivers/net/ftmac110.c @@ -4,8 +4,7 @@ * (C) Copyright 2010 Faraday Technology * Dante Su <dantesu@faraday-tech.com> * - * 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+ */ #include <common.h> |