]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes' into topic/uek-4.1/ofed
authorMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 6 Oct 2015 14:36:37 +0000 (07:36 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 6 Oct 2015 14:36:37 +0000 (07:36 -0700)
* topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes:
  ib_sdp/cma: readd SDP support to cma_save_net_info

1  2 
drivers/infiniband/core/cma.c

Simple merge