diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 02:53:36 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 02:53:36 +0100 |
| commit | 6929039761a3414e5c71448eb3dcc1d82fc1891d (patch) | |
| tree | 49b349170dd93821c2d515fee3931a4023da35da /arch/hexagon/include/asm/cmpxchg.h | |
| parent | arm64: get rid of fork/vfork/clone wrappers (diff) | |
| parent | arm64: elf: fix core dumping definitions for GP and FP registers (diff) | |
| download | linux-6929039761a3414e5c71448eb3dcc1d82fc1891d.tar.xz linux-6929039761a3414e5c71448eb3dcc1d82fc1891d.zip | |
Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64
Backmerge from mainline commit that introduced a trivial conflict in
arch/arm64/kernel/process.c - a bunch of functions removed next to the
place where kernel_thread() used to be.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/hexagon/include/asm/cmpxchg.h')
| -rw-r--r-- | arch/hexagon/include/asm/cmpxchg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/include/asm/cmpxchg.h b/arch/hexagon/include/asm/cmpxchg.h index c5f9527e1df6..9e7802911a57 100644 --- a/arch/hexagon/include/asm/cmpxchg.h +++ b/arch/hexagon/include/asm/cmpxchg.h @@ -1,7 +1,7 @@ /* * xchg/cmpxchg operations for the 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 |