]> 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>
Wed, 12 Aug 2015 22:53:51 +0000 (15:53 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Wed, 12 Aug 2015 22:53:51 +0000 (15:53 -0700)
* topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes:
  mlx4_vnic: Skip fip discover restart if pkey index not changed


Trivial merge