diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 20:03:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 20:03:02 +0300 |
| commit | e0b325d310a6b11f1538413fd557d2eb98f2fae5 (patch) | |
| tree | fcbe1573c7d69e500070447fb87f17d754c16665 /mm/memory.c | |
| parent | 28839855bf623f2d7eee72377d4896770a45494f (diff) | |
| parent | e8cea892dff8e3ebed42954c46730309b617196f (diff) | |
| download | linux-e0b325d310a6b11f1538413fd557d2eb98f2fae5.tar.xz | |
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"
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions