Merge branches 'cma', 'cxgb3', 'cxgb4', 'misc', 'nes', 'netlink', 'srp' and 'uverbs...
Roland Dreier [Wed, 25 May 2011 20:47:20 +0000 (13:47 -0700)]
1  2  3  4  5  6  7 
drivers/infiniband/core/ucma.c

Simple merge