]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0fb88b 4c67448)
Merge branch 'x86/boot'
authorIngo Molnar <mingo@kernel.org>
Mon, 12 Apr 2021 08:27:05 +0000 (10:27 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 12 Apr 2021 08:27:05 +0000 (10:27 +0200)
1  2 
arch/x86/boot/compressed/misc.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/setup.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/boot/compressed/misc.c
Simple merge
diff --cc arch/x86/kernel/setup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.