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 /drivers/block/sata_dwc.c | |
| parent | 4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff) | |
| parent | fdce7b633a1de24456226b18527cc7900c34282a (diff) | |
| download | talos-obmc-uboot-326ea986ac150acdc7656d57fca647db80b50158.tar.gz talos-obmc-uboot-326ea986ac150acdc7656d57fca647db80b50158.zip | |
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/block/sata_dwc.c')
| -rw-r--r-- | drivers/block/sata_dwc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/block/sata_dwc.c b/drivers/block/sata_dwc.c index 49288a7ba3..efca5eaba4 100644 --- a/drivers/block/sata_dwc.c +++ b/drivers/block/sata_dwc.c @@ -12,12 +12,7 @@ * Copyright 2006 Applied Micro Circuits Corporation * COPYRIGHT (C) 2005 SYNOPSYS, INC. ALL RIGHTS RESERVED * - * 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+ */ /* * SATA support based on the chip canyonlands. |
