]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit '5592f24a8b9bab0bcebe83404cd0de7bd114917e' into x86/build
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 29 Jan 2014 17:07:00 +0000 (09:07 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 29 Jan 2014 17:07:00 +0000 (09:07 -0800)
commit0e4a90a9dfd79d74861025d7f2b6a633e0093524
tree888b52771f540552a9dc85521d8dddf66eba9aeb
parent28a596855ad8475f6a4fd7d68f3aea297411cbd7
parent5592f24a8b9bab0bcebe83404cd0de7bd114917e
Merge commit '5592f24a8b9bab0bcebe83404cd0de7bd114917e' 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
arch/x86/boot/Makefile
arch/x86/tools/relocs.c