From: Mukesh Kacker Date: Tue, 6 Oct 2015 14:36:37 +0000 (-0700) Subject: Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes' into topic/uek-4.1/ofed X-Git-Tag: v4.1.12-92~264^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6237f11d3931eecd16bca11eae659a04838dc322;p=users%2Fjedix%2Flinux-maple.git Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes' into topic/uek-4.1/ofed * topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes: ib_sdp/cma: readd SDP support to cma_save_net_info --- 6237f11d3931eecd16bca11eae659a04838dc322