From: H. Peter Anvin <hpa@linux.intel.com>
Date: Wed, 29 Jan 2014 17:07:00 +0000 (-0800)
Subject: Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build
X-Git-Tag: v3.14-rc1~35^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125;p=pandora-kernel.git

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>
---

4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125
Reading git-diff-tree failed