summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-09-03 18:01:08 +0200
committerRoland Dreier <roland@purestorage.com>2013-09-03 18:01:08 +0200
commit82af24ac6fc3f4910218419a0ca4f05d42b45c67 (patch)
treec72594b29c5528145fd40d65b6f11060fe0f278d /drivers/net/ethernet
parentRDMA/cxgb4: Issue RI.FINI before closing when entering TERM (diff)
parentIB/core: Better checking of userspace values for receive flow steering (diff)
parentIPoIB: Fix race in deleting ipoib_neigh entries (diff)
parentIB/iser: Fix redundant pointer check in dealloc flow (diff)
parentIB/core: Fixes to XRC reference counting in uverbs (diff)
parentRDMA/ocrdma: Fix compiler warning about int/pointer size mismatch (diff)
parentIB/qib: Move COUNTER_MASK definition within qib_mad.h header guards (diff)
downloadlinux-82af24ac6fc3f4910218419a0ca4f05d42b45c67.tar.xz
linux-82af24ac6fc3f4910218419a0ca4f05d42b45c67.zip
Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next