aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/ulp
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-10-26 19:09:11 -0400
committerRoland Dreier <rolandd@cisco.com>2010-10-26 19:09:11 -0400
commit116e9535fe5e00bafab7a637f306b110cf95cff5 (patch)
tree59ab246aae5c0fc871434a50ad1eb42fce0af0b4 /drivers/infiniband/ulp
parentfc4ec9bd82dbe08499d801f45a1d49e4c7b66b20 (diff)
parent97cb7e40c69618ba03030b467faf60dc3ee982ee (diff)
parentca7cf94f8bf77bf0dfb35b615d82ac76a0ed77ff (diff)
parentaa1ad26089a90d5b7e2c908835ba6dc930eed019 (diff)
parent625fbd3a36d836efaaee4b6d9c2fcd25e3654624 (diff)
parent8ad330a002ffbc422f32a77398666832f0df8a3d (diff)
parentc3aa9b186b95025d4ba4e90d6140c9887dfaae0a (diff)
parent7454159d3c01371c1abed9d941044d95d2efde97 (diff)
parentd0d68b8693bd16bfbbc93b89f1d9f3351723307c (diff)
parent52106bd24c8d5e8a26b98ad93a755b0827029860 (diff)
parent2ca78d23a758d3299abd128556debff4c1fefb16 (diff)
parent19081f31ce941a22bfc681d18ae2d31e31084df5 (diff)
Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iboe', 'ipoib', 'misc', 'mlx4', 'nes', 'qib' and 'srp' into for-next