summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-12-02 01:33:47 +0100
committerRoland Dreier <rolandd@cisco.com>2010-12-02 01:33:47 +0100
commit7adce751ce79bcb6d0a591e6b94d76631c9a232c (patch)
tree107b588f09093083d2069d2de05a26e26b6a798d /drivers/infiniband
parentIB: Fix information leak in marshalling code (diff)
parentIB/mlx4: Fix IBoE link state (diff)
parentMAINTAINERS: Update NetEffect entry (diff)
downloadlinux-7adce751ce79bcb6d0a591e6b94d76631c9a232c.tar.xz
linux-7adce751ce79bcb6d0a591e6b94d76631c9a232c.zip
Merge branches 'misc', 'mlx4' and 'nes' into for-next