summaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-10-15 00:29:08 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-15 00:29:08 -0400
commit2ef1e9efebce49ffc9ae13a6e9d93da83734494e (patch)
treec89d5539712b1ae3ebe8425d52aab10ff3d9e17d /include/linux/netdevice.h
parent9b462d02d6dd671a9ebdc45caed6fe98a53c0ebe (diff)
parentc5bbcb5822b25c9f738db98e6d6ad2506cab8136 (diff)
downloadblackbird-op-linux-2ef1e9efebce49ffc9ae13a6e9d93da83734494e.tar.gz
blackbird-op-linux-2ef1e9efebce49ffc9ae13a6e9d93da83734494e.zip
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>
Diffstat (limited to 'include/linux/netdevice.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud