Merge branches 'cma', 'misc', 'mlx4', 'nes', 'qib' and 'uverbs' into for-next
authorRoland Dreier <roland@purestorage.com>
Wed, 4 Jan 2012 17:18:20 +0000 (09:18 -0800)
committerRoland Dreier <roland@purestorage.com>
Wed, 4 Jan 2012 17:18:20 +0000 (09:18 -0800)
1  2  3  4  5  6 
drivers/infiniband/core/uverbs_cmd.c

Simple merge