summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/ulp/iser/iser_verbs.c
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-05-15 20:06:01 -0700
committerRoland Dreier <rolandd@cisco.com>2010-05-15 20:06:01 -0700
commitffebedb7ab3f7964a70a1771547b26af38a189d2 (patch)
tree6f627a6c3b4ccefc231e6f81119da8d5f0903215 /drivers/infiniband/ulp/iser/iser_verbs.c
parente7494440573d9d7b5cb0e7ed9ae7d742226583de (diff)
parentbc1db9af731a74c7eca04df5936214c800774113 (diff)
parent5d7220e8dc24feed4bbd66667b7696906a147ac4 (diff)
parent617c9a7e398878d036a3aa9a063ccba145854b45 (diff)
parentbe4c9bad9d0edb6bc3bd8fffc2f98e0e2112da39 (diff)
parentd414371795d54fa916938f948105d08928abfbb9 (diff)
parent9fda1ac5fa09c49e9148f85be14f55e2bb856c0f (diff)
parent6fa8f719844b8455033e295f720e739c1dc3804a (diff)
parent9893e742a0d942dda2277e9f3e19b726900adf27 (diff)
parent3a2baff783497321e8322ce29f3a33a21c0d88f5 (diff)
parent53978b46cd946ef1dba96ed6d0276ff656dd5d42 (diff)
Merge branches 'amso1100', 'bkl', 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'iser', 'masked-atomics', 'misc', 'mthca' and 'nes' into for-next