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)

Trivial merge