summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-18 23:25:40 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-18 23:25:40 +0100
commit62ae144f56b61f541193df4a6465c06ee7eb9096 (patch)
tree913cc058b162c48e6c72d2b016b9e44201b16cee /drivers/infiniband
parentMerge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block (diff)
parentMerge branch 'master' (diff)
downloadlinux-62ae144f56b61f541193df4a6465c06ee7eb9096.tar.xz
linux-62ae144f56b61f541193df4a6465c06ee7eb9096.zip
Merge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions