From: David S. Miller <davem@davemloft.net>
Date: Wed, 15 Jan 2014 02:49:06 +0000 (-0800)
Subject: Merge branch 'r8152'
X-Git-Tag: v3.14-rc1~94^2~180
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=85a5bac9cd90966be75707e5b599bdd2cdcaa0e0;p=~emulex%2Finfiniband.git

Merge branch 'r8152'

Hayes Wang says:

====================
r8152: remove limitation

Remove the limitation between ecm mode and vendor mode.

v2: replace the patch #3 with "ecm and vendor modes coexist".
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

85a5bac9cd90966be75707e5b599bdd2cdcaa0e0