Merge branch 'mpls-next'
authorDavid S. Miller <davem@davemloft.net>
Sun, 8 Mar 2015 23:30:31 +0000 (19:30 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 8 Mar 2015 23:30:31 +0000 (19:30 -0400)
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>

Trivial merge