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: 0a744c4 5926687 ab04a0d)

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	78791b1f0a243085c352c8bfb70a4da972b87561
tree	ccb5639773c86cbea94d1c11a133fd23f52a21ca	tree \| snapshot
parent	0a744c4af632169ee3bb139d81b8dd0d3c48d4b2	commit \| diff
parent	5926687f8f617415badc14373ca00c804c5a37dd	commit \| diff
parent	ab04a0d24ee71014912f7ce30bb69f907d2ca7bf	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.