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 /include/linux/mtd/docg4.h | |
| 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 'include/linux/mtd/docg4.h')
| -rw-r--r-- | include/linux/mtd/docg4.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/mtd/docg4.h b/include/linux/mtd/docg4.h index 982f5ad..741fc0d 100644 --- a/include/linux/mtd/docg4.h +++ b/include/linux/mtd/docg4.h @@ -1,9 +1,7 @@ /* * Copyright (C) 2013 Mike Dunn <mikedunn@newsguy.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+ */ #ifndef __DOCG4_H__ |