Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next
Roland Dreier [Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)]
1  2  3  4  5 
drivers/infiniband/ulp/srp/ib_srp.c

Simple merge