Roland Dreier ec329a1359 Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)		2005-10-24 10:55:29 -07:00
..
mthca	Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)	2005-10-24 10:55:29 -07:00