git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6a47ac6 c2833c2 91d4bc1)

author	Russell King <rmk+kernel@armlinux.org.uk>
	Mon, 13 Aug 2018 15:28:50 +0000 (16:28 +0100)
committer	Russell King <rmk+kernel@armlinux.org.uk>
	Mon, 13 Aug 2018 15:28:50 +0000 (16:28 +0100)
commit	36ab77e44d09cb970467984ea4731a86b30a8454
tree	ccb5639773c86cbea94d1c11a133fd23f52a21ca	tree \| snapshot
parent	6a47ac6622032c9233edd8de4337882010b645af	commit \| diff
parent	c2833c2a1b8c3c4b8ed410aeef7b02485838a83b	commit \| diff
parent	91d4bc1fdf451b03c8f5fec73156dc1c41cdf6e8	commit \| diff

Merge branches 'fixes', 'misc' and 'spectre' into for-linus

Conflicts:
arch/arm/include/asm/uaccess.h

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

arch/arm/include/asm/assembler.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/include/asm/uaccess.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/kernel/head-nommu.S	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/kernel/signal.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/kernel/sys_oabi-compat.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/vfp/vfpmodule.c	diff1 \|	diff2 \|	diff3 \|	blob \| history

Linux Kernel Source Tree.