Ingo Molnar 1ed7d32763 Merge branch 'x86/boot' into x86/mm, to pick up interacting changes ... The SME patches we are about to apply add some E820 logic, so merge in pending E820 code changes first, to have a single code base. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-07-18 11:36:53 +02:00
..
asm	Merge branch 'x86/boot' into x86/mm, to pick up interacting changes	2017-07-18 11:36:53 +02:00
uapi/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-07-05 12:31:59 -07:00