diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 08:18:47 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 08:18:47 +0400 |
| commit | 326f3abf19360014dfae968aa3ab891d25599618 (patch) | |
| tree | a57251231cb889e4e6b0f26d023990578b7bd98e /arch/hexagon/include/asm/module.h | |
| parent | ef405e04abd0d4bc3f7082d241517f6db3f5c06d (diff) | |
| parent | 64a574344dadbee5d01819d9d73b594d3cbe448e (diff) | |
| download | linux-326f3abf19360014dfae968aa3ab891d25599618.tar.xz | |
Merge branch 'next/dt-exynos4x12' into next/dt-samsung
Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
Diffstat (limited to 'arch/hexagon/include/asm/module.h')
| -rw-r--r-- | arch/hexagon/include/asm/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/include/asm/module.h b/arch/hexagon/include/asm/module.h index 72ba494e6d7d..6b4323acef44 100644 --- a/arch/hexagon/include/asm/module.h +++ b/arch/hexagon/include/asm/module.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. + * Copyright (c) 2010-2011, The Linux Foundation. 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 version 2 and |