git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7add787 e4160b2)

author	Ingo Molnar <mingo@kernel.org>
	Sat, 21 Mar 2020 08:23:40 +0000 (09:23 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Sat, 21 Mar 2020 08:24:41 +0000 (09:24 +0100)
commit	a4654e9bde4ecedb4921e6c8fe2088114bdff1b3
tree	1b9970b520d7bc7176cc9460fe67f210be5ea181	tree \| snapshot
parent	7add7875a8eb4ffe5eddaf8a11e409c9e1b6e3f3	commit \| diff
parent	e4160b2e4b02377c67f8ecd05786811598f39acd	commit \| diff

Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Conflicts:
arch/x86/purgatory/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>

19 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/vdso/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/purgatory/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/realmode/rm/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/firmware/efi/libstub/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
mm/Makefile	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.lib	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository