diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 19:18:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 19:18:43 -0700 |
| commit | 807501475fce0ebe68baedf87f202c3e4ee0d12c (patch) | |
| tree | 1df7d070d9d0f30e08e58f0446a0b0567e6797cc /include/asm-m32r/cputime.h | |
| parent | 2848077044a5fdeb942bd1342c550da4c452d66a (diff) | |
| parent | bc751fe6fff3ff894784acfed1bed8639b632c09 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ipath: Correct capitalization "IntX" -> "INTx"
IB/ipath: Remove tests of PCI_MSI in ipath_iba7220.c
IB/ipath: Remove dependency on PCI_MSI || HT_IRQ
IB/ipath: Build IBA7220 code unconditionally
IB/ipath: Remove reference to dev->class_dev
IB/ipath: Fix module parameter description for disable_sma
RDMA/nes: Remove unneeded function declarations
Fix up conflict in drivers/infiniband/hw/ipath/ipath_verbs.c (by picking
the solution from the infiniband branch)
Diffstat (limited to 'include/asm-m32r/cputime.h')
0 files changed, 0 insertions, 0 deletions