]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
authorRoland Dreier <rolandd@cisco.com>
Mon, 24 Oct 2005 17:55:29 +0000 (10:55 -0700)
committerRoland Dreier <rolandd@cisco.com>
Mon, 24 Oct 2005 17:55:29 +0000 (10:55 -0700)
commitec329a135974f1c400214dab02f09584d4beeba9
tree235be754f76f4e7d51975d2434f226cfc75cdd08
parentbbf207860931b6a033d0fbcd170ae2332c0d8216
parent5d7edb3c1a01310725d86f0d83fb3be45685dc82
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
drivers/infiniband/core/cm.c
drivers/infiniband/core/sa_query.c
drivers/infiniband/core/ucm.c
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/hw/mthca/mthca_eq.c