tree 5105e8e6036e812eb184a0411227818663636d62
parent 340611ab7f8c95e9638bb8a181cb078e900dc5ec
parent 84b6f7456e8b88507dd85f988a9d350eb5af0e46
author David S. Miller <davem@davemloft.net> 1369360457 -0700
committer David S. Miller <davem@davemloft.net> 1369360457 -0700

Merge branch 'bnx2x'

Yuval Mintz says:

====================
This series contain several small enhancements - chief among those are
the implementation of ethtool's private flags callback to share information
about the storage offload capabilities of its network interfaces,
and the prevention of a link flap when booting from storage area networks.

Changes from V1:
  - Patch 1, removed trailing whitespaces from private flag strings.
====================

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