summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-07-27 00:59:47 +0400
committerRoland Dreier <rolandd@cisco.com>2008-07-27 00:59:47 +0400
commitcc9969c96765476db5e30c9e074a57838604c1d1 (patch)
tree919c8528ca998f037afb8a512ba0f9c81e70069c /drivers/infiniband
parent5ba18b186c979283a2bf75a28b7ea325184b0c08 (diff)
parent9905922446f6dc02fd4650c8f59114d6bdb5b777 (diff)
parent51a379d0c8f7a6db7c9e3c9c770d90a6d2d1ef9b (diff)
parent6492cdf3a24fd620660c399745b5e169a0ed27d6 (diff)
downloadlinux-cc9969c96765476db5e30c9e074a57838604c1d1.tar.xz
Merge branches 'bkl-removal', 'ipoib', 'mlx4' and 'nes' into for-linus