Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)

2005-10-24 10:55:29 -07:00
parent bbf2078609 5d7edb3c1a
commit ec329a1359
99 changed files with 1200 additions and 691 deletions
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -993,6 +993,7 @@ static int __init ib_sa_init(void)
 static void __exit ib_sa_cleanup(void)
 {
 	ib_unregister_client(&sa_client);
+	idr_destroy(&query_idr);
 }

 module_init(ib_sa_init);