diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-16 17:56:50 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-16 17:56:50 +0200 |
commit | 6a2f30a03acbf226aeb5a93783e6172aa0682d78 (patch) | |
tree | 0c105d2974cac3eb1767b61d01d2bedf29a2ab46 /arch/arm/dts | |
parent | a90bed77a6ec51cf8032a4d731014f9381ec6466 (diff) | |
parent | e7f9350525d73233d4eaf1793f8fe618e9fd4910 (diff) | |
download | u-boot-imx-6a2f30a03acbf226aeb5a93783e6172aa0682d78.zip u-boot-imx-6a2f30a03acbf226aeb5a93783e6172aa0682d78.tar.gz u-boot-imx-6a2f30a03acbf226aeb5a93783e6172aa0682d78.tar.bz2 |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/dts')
-rw-r--r-- | arch/arm/dts/imx6q-sabreauto.dts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/dts/imx6q-sabreauto.dts b/arch/arm/dts/imx6q-sabreauto.dts index a3c9c91..7af2a88 100644 --- a/arch/arm/dts/imx6q-sabreauto.dts +++ b/arch/arm/dts/imx6q-sabreauto.dts @@ -1,9 +1,9 @@ /* - + * Copyright 2012 Freescale Semiconductor, Inc. - + * Copyright 2011 Linaro Ltd. - + * - + * SPDX-License-Identifier: GPL-2.0+ - + */ + * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * SPDX-License-Identifier: GPL-2.0+ + */ /dts-v1/; |