From: David S. Miller <davem@davemloft.net>
Date: Wed, 15 Oct 2014 04:29:08 +0000 (-0400)
Subject: Merge branch 'cxgb4'
X-Git-Tag: v3.18-rc1~32^2~28
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2ef1e9efebce49ffc9ae13a6e9d93da83734494e;p=~emulex%2Finfiniband.git

Merge branch 'cxgb4'

Anish Bhatt says:

====================
ipv6 and related cleanup for cxgb4/cxgb4i

This patch set removes some duplicated/extraneous code from cxgb4i, guards
cxgb4 against compilation failure based on ipv6 tristate, make ipv6 related
code no longer be enabled by default irrespective of ipv6 tristate and fixes
a refcnt issue.
-Anish

v2 : Provide more detailed commit messages, make subject more concise as
recommended by Dave Miller.
====================

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

2ef1e9efebce49ffc9ae13a6e9d93da83734494e