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)
1  2 
drivers/infiniband/hw/mthca/mthca_cmd.c
drivers/infiniband/hw/mthca/mthca_memfree.c
drivers/infiniband/hw/mthca/mthca_memfree.h