Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 17 Nov 2012 01:53:36 +0000 (20:53 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 17 Nov 2012 01:53:36 +0000 (20:53 -0500)
commit6929039761a3414e5c71448eb3dcc1d82fc1891d
tree49b349170dd93821c2d515fee3931a4023da35da
parente0fd18ce1169595df929373cad2ae9b00b2289c2
parent6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d
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>
arch/arm64/Kconfig
arch/arm64/include/asm/processor.h
arch/arm64/kernel/process.c