summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2011-03-23 21:13:37 +0300
committerRoland Dreier <roland@purestorage.com>2011-03-23 21:13:37 +0300
commitba82638247c10cfda32268c894f78f8124f54084 (patch)
treeca46805a5343218fd7445c08a1025c74c5bfa6ac /drivers/infiniband
parent7f9e5c48c1078507747434d4c182ab10925bf98a (diff)
parent748bfd9c1ded8419e7fdba4ca6f0c1dc1642df63 (diff)
parent071c7783479ac3beb09a21e74305a4f6af1e68d6 (diff)
downloadlinux-ba82638247c10cfda32268c894f78f8124f54084.tar.xz
Merge branches 'misc', 'nes' and 'srp' into for-next