summaryrefslogtreecommitdiff
path: root/include/configs/o2mnt.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-07-25 17:57:46 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-07-25 17:57:46 +0200
commit8b485ba12b0defa0c4ed3559789250238f8331a8 (patch)
treea1174810bef0d504370272918dca8d485ae2ae3b /include/configs/o2mnt.h
parent12607adcd5181a8f6eab885a5fe4ba2fa12ef92a (diff)
parentaaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (diff)
downloadu-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.zip
u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.gz
u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.bz2
Merge branch 'u-boot/master' into u-boot-arm/master
Diffstat (limited to 'include/configs/o2mnt.h')
-rw-r--r--include/configs/o2mnt.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/configs/o2mnt.h b/include/configs/o2mnt.h
index 0c319b1..c2164b5 100644
--- a/include/configs/o2mnt.h
+++ b/include/configs/o2mnt.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+
*/
/*