summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-01-04 09:18:20 -0800
committerRoland Dreier <roland@purestorage.com>2012-01-04 09:18:20 -0800
commit1583676d9e3f97371eaa726c4e061f9b23f43c44 (patch)
treebcef0195095874c1f76d8a2502a58c6ec60282b9 /include
parentc89d1bedf8b130d5b20f56a484989a19a2c2842a (diff)
parent6f233d300d301b08b4627fbcf29dfc4eda16e4d8 (diff)
parent9106c410697427363517ca6b4f463698aebc5f25 (diff)
parent196f40c8464799d185ee7417d2ee532468b374e6 (diff)
parent8d4548f2b7407f7212f71831bb7b457ceb752709 (diff)
parente214a0fe2b382fa302c036ecd6e6ffe99e3b9875 (diff)
Merge branches 'cma', 'misc', 'mlx4', 'nes', 'qib' and 'uverbs' into for-next