tree d0c76905c962ebf1a36c58b70cd24dbb6ba51d3d
parent 0791e98dd1cd1833547f814188b25b6c8c711ad5
parent eab9e6137f237681a04649e786cc4d942bedd6d1
author Linus Torvalds <torvalds@linux-foundation.org> 1319643723 +0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1319643723 +0200

Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/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