]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'cxgb4'
authorDavid S. Miller <davem@davemloft.net>
Wed, 15 Oct 2014 04:29:08 +0000 (00:29 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Oct 2014 04:29:08 +0000 (00:29 -0400)
commiteebd0a9388a8d742cedb727c1d0c950fb544e5a4
treec89d5539712b1ae3ebe8425d52aab10ff3d9e17d
parent4b94898c54a974d044cf9055551d853bd48bbb7c
parent5561caf9c9f5358cd0cfdf8bb50f6bafa5757f37
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>