Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
commit36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2009 22:20:17 +0000 (15 15:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2009 22:20:17 +0000 (15 15:20 -0700)
tree99e0c131153d2f8126b6bd64e9a2a0e4e68216a0
parent21279cfa107af07ef985539ac0de2152b9cba5f5
parentdb8590f5043f3436a65b24155a3a7af2604df876
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  Revert "x86: linker script syntax nits"
  x86, perf_event: Rename 'performance counter interrupt'