commit | e0b325d310a6b11f1538413fd557d2eb98f2fae5 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 13 09:03:02 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 13 09:03:02 2009 -0800 |
tree | fcbe1573c7d69e500070447fb87f17d754c16665 | |
parent | 28839855bf623f2d7eee72377d4896770a45494f [diff] | |
parent | e8cea892dff8e3ebed42954c46730309b617196f [diff] |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/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"