Merge branch 'for-linus' from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

This commit is contained in:
Linus Torvalds 2005-09-28 07:47:55 -07:00
commit 2dd3c1df95
8 changed files with 104 additions and 72 deletions

View file

@ -665,7 +665,6 @@ struct ib_ucontext {
struct list_head qp_list;
struct list_head srq_list;
struct list_head ah_list;
spinlock_t lock;
};
struct ib_uobject {