diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-31 13:34:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-31 13:34:15 -0400 |
| commit | bc48878c06028f297e4fdf75be7dda88de050430 (patch) | |
| tree | 418790613ce71a53794396ec5cb64caa062ef77a /net/ipv6/ip6mr.c | |
| parent | 19a12049cd12ea2c5195f81e747adbc2c89e6560 (diff) | |
| parent | 0f587f1bfb1fb15d9ebd94c565dd11ae6d4e03b6 (diff) | |
| download | linux-bc48878c06028f297e4fdf75be7dda88de050430.tar.bz2 | |
Merge branch 'bnx2x-next'
Yuval Mintz says:
====================
bnx2x: link and protection changes
This patch series contains 2 small additions to link configuration,
as well as a safeguard against loading the device on a hardware at
a failed state.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6mr.c')
0 files changed, 0 insertions, 0 deletions