diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 13:18:47 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 13:18:47 +0900 |
commit | 326f3abf19360014dfae968aa3ab891d25599618 (patch) | |
tree | a57251231cb889e4e6b0f26d023990578b7bd98e /arch/hexagon/kernel/syscalltab.c | |
parent | ef405e04abd0d4bc3f7082d241517f6db3f5c06d (diff) | |
parent | 64a574344dadbee5d01819d9d73b594d3cbe448e (diff) |
Merge branch 'next/dt-exynos4x12' into next/dt-samsung
Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
Diffstat (limited to 'arch/hexagon/kernel/syscalltab.c')
-rw-r--r-- | arch/hexagon/kernel/syscalltab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/kernel/syscalltab.c b/arch/hexagon/kernel/syscalltab.c index c550f4177ab8..7024b1ddc08a 100644 --- a/arch/hexagon/kernel/syscalltab.c +++ b/arch/hexagon/kernel/syscalltab.c @@ -1,7 +1,7 @@ /* * System call table for Hexagon * - * 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 |