Merge branch 'vlan_action'
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Nov 2014 19:20:23 +0000 (14:20 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Nov 2014 19:20:23 +0000 (14:20 -0500)
Jiri Pirko says:

====================
sched: introduce vlan action

Please see the individual patches for info
====================

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

Trivial merge