diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-26 11:22:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-26 11:22:03 -0500 |
| commit | 9003019192f045eee8e451916a4bc289c2a3e1be (patch) | |
| tree | 8f323487c0f38547ad0231afdcb1e633994bcd31 /net/bridge | |
| parent | 009f33ed6f9d9da0141c2d18b1c7912d2d9be7c1 (diff) | |
| parent | e47172ab7e4176883077b454286bbd5b87b5f488 (diff) | |
Merge branch 'rocker-next'
Scott Feldman says:
====================
rocker cleanups
Pushing out some rocker cleanups I've had in my queue for a while. Nothing
major, just some sync-up with changes that already went into device code
(hard-coding desc err return values and lport renaming). Also fixup
port fowarding transitions prompted by some DSA discussions about how to
restore port state when port leaves bridge.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
0 files changed, 0 insertions, 0 deletions