Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorRoland Dreier <rolandd@cisco.com>
Fri, 28 Oct 2005 22:50:51 +0000 (15:50 -0700)
committerRoland Dreier <rolandd@cisco.com>
Fri, 28 Oct 2005 22:50:51 +0000 (15:50 -0700)
commita4da0628efd788eb199dd9df225e296035ec2539
tree1e611030c993e1480dc2f07f26976d2d33002b0d
parent70a30e16a8a9d22396a4d1e96af86e43594df584
parent20731945ae743034353a88c307920d1f16cf8ac8
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
drivers/infiniband/hw/mthca/mthca_cmd.c
drivers/infiniband/hw/mthca/mthca_memfree.c
drivers/infiniband/hw/mthca/mthca_memfree.h