aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-01 18:26:31 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-01 18:26:31 -0700
commitcf105601df49ba0ea5ac04a6154c6c1442994c74 (patch)
treeaafc54a8b2518b057f73deac08076bcb39f4b998 /fs
parent6ba815ded3fef03e888a9fc8eae3113938ff5349 (diff)
parentf6f0413e10b76440fb82efebc63120f3b6d42adb (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: tidy up white space in a few files IB/ipath: fix label name in interrupt handler IB/ipath: improve sparse annotation IB/ipath: simplify IB timer usage IB/ipath: simplify RC send posting IB/ipath: prevent hardware from being accessed during reset IB/ipath: fix verbs registration IB/ipath: change handling of PIO buffers IB/ipath: iterate over correct number of ports during reset IB/ipath: set up 32-bit DMA mask if 64-bit setup fails IB/ipath: fix race with exposing reset file IB/mthca: Fix offset in query_gid method
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions