From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Oct 2011 15:42:03 +0000 (+0200)
Subject: Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.2-rc1~157
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=7b86572a7a920e3181b041b8d1a01582e4610b66

Merge branch 'x86-asm-for-linus' of git://git./linux/kernel/git/tip/tip

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86-64: Fix CFI data for interrupt frames
  x86-64: Don't apply destructive erratum workaround on unaffected CPUs
---

7b86572a7a920e3181b041b8d1a01582e4610b66