Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build

Bring in upstream merge of x86/kaslr for future patches.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/boot/Makefile
Simple merge

diff --cc arch/x86/tools/relocs.c
Simple merge