Merge branch 'openvswitch-net'
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 Dec 2014 04:57:38 +0000 (23:57 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Dec 2014 04:57:38 +0000 (23:57 -0500)
Pravin B Shelar says:

====================
openvswitch: datapath fixes

Following patch series is mostly targeted to MPLS fixes. other
patches are related datapth transmit path error handling.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge