git.agner.ch Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e22af0b 2d6be4a)

author	Ingo Molnar <mingo@kernel.org>
	Wed, 1 Mar 2017 08:02:26 +0000 (09:02 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 1 Mar 2017 08:02:26 +0000 (09:02 +0100)
commit	0871d5a66da5c41151e0896a90298b163e42f2e0
tree	1ba71fab9016cb28bb9d18ffd62b6b744f2f761c	tree \| snapshot
parent	e22af0be2cf654bb225f19750c6b9aab1627dc9e	commit \| diff
parent	2d6be4abf514fc26c83d239c7f31da1f95e4a31d	commit \| diff

Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates

Conflicts:
arch/x86/xen/setup.c

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

15 files changed:

Documentation/x86/zero-page.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/compressed/eboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/uapi/asm/bootparam.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/centaur.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel tree with some unpolished code for Colibri/Apalis modules