Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next
authorRoland Dreier <roland@purestorage.com>
Tue, 14 Oct 2014 21:09:12 +0000 (14:09 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 14 Oct 2014 21:09:12 +0000 (14:09 -0700)
commit7b909bb49ac204bfd2e628707db37beb490dbc5c
tree0484423a8147b2fa15564213403b882a610fe9bd
parenta040f95dc81986d7d55bd98a9455217522ef706d
parentda22b896b119001b0cd9eb9ecb5b3fd85e948e43
parent78eda2bb6542057b214af3bc1cae09c63e65d1d1
parentf39f86971c0cded8c2563e7dfd82c650ca9c0044
parent05df78059b3b991036666de9ee124d5cbd9e375d
Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/hw/mlx5/qp.c