rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit

]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit

projects / can-eth-gw-linux.git / commit

author	Al Viro <viro@zeniv.linux.org.uk>
	Sat, 17 Nov 2012 01:53:36 +0000 (20:53 -0500)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Sat, 17 Nov 2012 01:53:36 +0000 (20:53 -0500)
commit	6929039761a3414e5c71448eb3dcc1d82fc1891d
tree	49b349170dd93821c2d515fee3931a4023da35da	tree \| snapshot
parent	e0fd18ce1169595df929373cad2ae9b00b2289c2	commit \| diff
parent	6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history