aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2009-01-16 15:05:54 -0800
committerRoland Dreier <rolandd@cisco.com>2009-01-16 15:05:54 -0800
commitac8581d408d41ebd5583b4e85b18e7ef16bb044b (patch)
tree6ca03489556cee6c207280cc6d0fdb4765b1d250 /arch
parentee96aae57381e77311538f4a1dd4326f6ae079d1 (diff)
parent3c20962086b0ceb5498ba840e5a91bf4a692aae9 (diff)
parent0fd7e1d8559f45a6838cee93ea49adc0c5bda8f0 (diff)
Merge branches 'ehca', 'ipoib' and 'mlx4' into for-linus