From: David S. Miller <davem@davemloft.net>
Date: Sun, 8 Mar 2015 23:30:31 +0000 (-0400)
Subject: Merge branch 'mpls-next'
X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~302
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b974499e44536fd524dfad23f4f8477e6e243ab;p=pandora-kernel.git

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>
---

9b974499e44536fd524dfad23f4f8477e6e243ab