From: Linus Torvalds Date: Tue, 30 Apr 2013 15:37:24 +0000 (-0700) Subject: Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~111 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01c7cd0ef5d98fdd007d8a04c9f834bead6e5ee1;p=pandora-kernel.git Merge branch 'x86-kaslr-for-linus' of git://git./linux/kernel/git/tip/tip Pull perparatory x86 kasrl changes from Ingo Molnar: "This contains changes from the ongoing KASLR work, by Kees Cook. The main changes are the use of a read-only IDT on x86 (which decouples the userspace visible virtual IDT address from the physical address), and a rework of ELF relocation support, in preparation of random, boot-time kernel image relocation." * 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, relocs: Refactor the relocs tool to merge 32- and 64-bit ELF x86, relocs: Build separate 32/64-bit tools x86, relocs: Add 64-bit ELF support to relocs tool x86, relocs: Consolidate processing logic x86, relocs: Generalize ELF structure names x86: Use a read-only IDT alias on all CPUs --- 01c7cd0ef5d98fdd007d8a04c9f834bead6e5ee1 Reading git-diff-tree failed