From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Jan 2009 17:03:02 +0000 (-0800)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.29-rc2~88
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=e0b325d310a6b11f1538413fd557d2eb98f2fae5;p=cascardo%2Flinux.git

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"
---

e0b325d310a6b11f1538413fd557d2eb98f2fae5