diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-09 02:30:31 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-09 02:30:31 +0300 |
| commit | 9b974499e44536fd524dfad23f4f8477e6e243ab (patch) | |
| tree | fb927e9867e7a013c4ce142a993458d15ee20cef /drivers/net/ethernet/neterion/s2io.c | |
| parent | 008a5b07f1b4beab1004ac799f449b59a45af8e9 (diff) | |
| parent | b79bda3d38ae67940f1740f7e015f284eb551680 (diff) | |
| download | linux-9b974499e44536fd524dfad23f4f8477e6e243ab.tar.xz | |
Merge branch 'mpls-next'
Eric W. Biederman says:
====================
mpls: Minor fixes and cleanups
This is a bunch of small changes that have come out of the discussions
of the mpls code and the automated tests that people run against things.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/neterion/s2io.c')
0 files changed, 0 insertions, 0 deletions