diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-07 11:35:33 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-07 11:35:33 (GMT) |
commit | 06be5eefe1192eb8ce8d07497f67595b6bfe9741 (patch) | |
tree | 80f1987d4970f8079681f8be0c135cafc8d6329a /arch/arm/boot/dts/imx6dl-hummingboard.dts | |
parent | 11b8b25ce4f8acfd3b438683c0c9ade27756c6e8 (diff) | |
parent | 1bd46782d08b01b73df0085b51ea1021b19b44fd (diff) | |
download | linux-06be5eefe1192eb8ce8d07497f67595b6bfe9741.tar.xz |
Merge branches 'fixes' and 'ioremap' into for-linus
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-hummingboard.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6dl-hummingboard.dts | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts index 7369d2d..d5c9660 100644 --- a/arch/arm/boot/dts/imx6dl-hummingboard.dts +++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts @@ -8,9 +8,8 @@ * whole. * * a) This file 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. + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. * * This file is distributed in the hope that it will be useful * but WITHOUT ANY WARRANTY; without even the implied warranty of |