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

This commit is contained in:
Roland Dreier
2005-10-24 10:55:29 -07:00
99 changed files with 1200 additions and 691 deletions

View File

@ -1450,6 +1450,7 @@ static void __exit ib_ucm_cleanup(void)
ib_unregister_client(&ucm_client);
class_unregister(&ucm_class);
unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);
idr_destroy(&ctx_id_table);
}
module_init(ib_ucm_init);