From: H. Peter Anvin Date: Fri, 19 Oct 2012 14:54:24 +0000 (-0700) Subject: Merge commit '5bc66170dc486556a1e36fd384463536573f4b82' into x86/urgent X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4533d86270d7986e00594495dde9a109d6be27ae;p=deliverable%2Flinux.git Merge commit '5bc66170dc486556a1e36fd384463536573f4b82' into x86/urgent From Borislav Petkov : Below is a RAS fix which reverts the addition of a sysfs attribute which we agreed is not needed, post-factum. And this should go in now because that sysfs attribute is going to end up in 3.7 otherwise and thus exposed to userspace; removing it then would be a lot harder. This is done as a merge rather than a simple patch/cherry-pick since the baseline for this patch was not in the previous x86/urgent. Signed-off-by: H. Peter Anvin --- 4533d86270d7986e00594495dde9a109d6be27ae