aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/nes/nes_nic.c
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-05-25 09:54:03 -0700
committerRoland Dreier <rolandd@cisco.com>2010-05-25 09:54:03 -0700
commitacdc30b56abc0db7d409a13e9b6c72ea23b6f90d (patch)
treef2f8b7e409128b9d0e1335c60c73f4b2fec70d94 /drivers/infiniband/hw/nes/nes_nic.c
parentRDMA/cxgb4: Only insert sq qid in lookup table (diff)
parentIB/mad: Make needlessly global mad_sendq_size/mad_recvq_size static (diff)
parentmlx4_core: Clean up mlx4_alloc_icm() a bit (diff)
parentRDMA/nes: Fix incorrect unlock in nes_process_mac_intr() (diff)
parentIB/ipath: Remove support for QLogic PCIe QLE devices (diff)
downloadlinux-dev-acdc30b56abc0db7d409a13e9b6c72ea23b6f90d.tar.xz
linux-dev-acdc30b56abc0db7d409a13e9b6c72ea23b6f90d.zip
Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'qib' into for-next