Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2009 17:03:02 +0000 (09:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2009 17:03:02 +0000 (09:03 -0800)
commite0b325d310a6b11f1538413fd557d2eb98f2fae5
treefcbe1573c7d69e500070447fb87f17d754c16665
parent28839855bf623f2d7eee72377d4896770a45494f
parente8cea892dff8e3ebed42954c46730309b617196f
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 "i386: add TRACE_IRQS_OFF for the nmi"