diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 05:48:13 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 05:49:06 +0400 |
| commit | 85910c202bb869edd2bb9a6c217a658c83f06f1e (patch) | |
| tree | fcf4bf1ba2ebfcb6dec395a10ed6b33e7d33217e /arch/hexagon/kernel/time.c | |
| parent | f7200d4c504a385b1b70f3bab379f99745f7ef6a (diff) | |
| parent | 517ffce4e1a03aea979fe3a18a3dd1761a24fafb (diff) | |
| download | linux-85910c202bb869edd2bb9a6c217a658c83f06f1e.tar.xz | |
Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc
Backmerge from the point in mainline where a trivial conflict had been
introduced (arch/sparc/kernel/sys_sparc_64.c had grown sys_kern_features()
right after where kernel_execve() used to be)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/hexagon/kernel/time.c')
| -rw-r--r-- | arch/hexagon/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/kernel/time.c b/arch/hexagon/kernel/time.c index 36ba64185711..9903fad997f3 100644 --- a/arch/hexagon/kernel/time.c +++ b/arch/hexagon/kernel/time.c @@ -1,7 +1,7 @@ /* * Time related functions for Hexagon architecture * - * 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 |