diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 09:03:02 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 09:03:02 -0800 |
commit | e0b325d310a6b11f1538413fd557d2eb98f2fae5 (patch) | |
tree | fcbe1573c7d69e500070447fb87f17d754c16665 /drivers/infiniband/hw/ehca/ehca_sqp.c | |
parent | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | Revert "i386: add TRACE_IRQS_OFF for the nmi" (diff) | |
download | linux-dev-e0b325d310a6b11f1538413fd557d2eb98f2fae5.tar.xz linux-dev-e0b325d310a6b11f1538413fd557d2eb98f2fae5.zip |
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 'drivers/infiniband/hw/ehca/ehca_sqp.c')
0 files changed, 0 insertions, 0 deletions