review.tizen.org Git - sdk/emulator/emulator-kernel.git/commit

projects / sdk / emulator / emulator-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9b3965f f4bcd8c)

author	H. Peter Anvin <hpa@linux.intel.com>
	Wed, 29 Jan 2014 17:07:00 +0000 (09:07 -0800)
committer	H. Peter Anvin <hpa@linux.intel.com>
	Wed, 29 Jan 2014 17:07:00 +0000 (09:07 -0800)
commit	4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125
tree	888b52771f540552a9dc85521d8dddf66eba9aeb	tree \| snapshot
parent	9b3965f7401b0cc3ed2c228085a4c13b1c9243b1	commit \| diff
parent	f4bcd8ccddb02833340652e9f46f5127828eb79d	commit \| diff

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>

arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/tools/relocs.c	diff1 \|	diff2 \|	blob \| history

Domain: SDK / Emulator;