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)
commitdf6ce47091620d76bbe036d0af3dc1abad4576c1
tree71a5fdd4619a199af70f8fbaa8eca6a1fc4f141f
parentfe1591224a1c454f4344d59e11ccd44577c00508
parentc7e2b9689ef81362a8091592da6cb6a7723f377a
Merge branch 'vlan_action'

Jiri Pirko says:

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

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

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