Merge branch 'misc' into for-next
authorRoland Dreier <rolandd@cisco.com>
Tue, 2 Mar 2010 07:52:31 +0000 (23:52 -0800)
committerRoland Dreier <rolandd@cisco.com>
Tue, 2 Mar 2010 07:52:31 +0000 (23:52 -0800)
commitfe8875e5a41a36ef26072cf05731df5493ade0e1
tree786c31c1e86f5287177210fb469c8ecae0bdd146
parentf57721507ffeaf8785f7f17254651de4d8b45e09
parenta265e5587f078618c1f17c3a83da65046f18746f
Merge branch 'misc' into for-next

Conflicts:
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/hw/mlx4/qp.c