Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
commitbb77c03cf40fec911c4ce9610b8207bf0050a5fd
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Oct 2005 23:55:43 +0000 (4 16:55 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Oct 2005 23:55:43 +0000 (4 16:55 -0700)
tree72376e4a216f9e107e5527df9614a7fa6f078e67
parentce12467d44d7394731ec9e91e032d50b04e502f6
parentaba7a22f291c13448177b28e0e3d01260ed04fbe
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband