git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: afc9f65 001a30c a3c0f84)

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	c61b466d4f886613c7e71de8282701646a4d999d
tree	ccb5639773c86cbea94d1c11a133fd23f52a21ca	tree \| snapshot
parent	afc9f65e01cd114cb2cedf544d22239116ce0cc6	commit \| diff
parent	001a30c4d0e871b21d296e1bcafc6756a1b10607	commit \| diff
parent	a3c0f84765bb429ba0fd23de1c57b5e1591c9389	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

John Crispins staging tree