diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-13 18:36:07 +0100 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-13 18:36:07 +0100 |
commit | 6097a07411005c0184cf90256743c784079198fc (patch) | |
tree | 0c6496aa7de5f00a60ed8e7bac4b34f5acc7e30a /arch/hexagon/kernel/syscalltab.c | |
parent | arm64: Use generic sys_execve() implementation (diff) | |
parent | Linux 3.7-rc5 (diff) | |
download | linux-6097a07411005c0184cf90256743c784079198fc.tar.xz linux-6097a07411005c0184cf90256743c784079198fc.zip |
Merge tag 'v3.7-rc5' into execve
Linux 3.7-rc5
Conflicts:
arch/arm64/kernel/process.c
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 |