Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 13 Jan 2006 23:29:07 +0000 (15:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 13 Jan 2006 23:29:07 +0000 (15:29 -0800)
commitfb7ffeb11bb7e9e75dc83ff67a4925c270e0fa3c
tree6344d7a8a8a828f346f8eceb99339f8ba2c63cc1
parent69eebed240b32377b9034551f1b8c4ae2774ceb6
parent95ed644fd12f53c6fc778f3f246974e5fe3a9468
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband