diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-21 20:20:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-21 20:20:23 +0100 |
| commit | df6ce47091620d76bbe036d0af3dc1abad4576c1 (patch) | |
| tree | 71a5fdd4619a199af70f8fbaa8eca6a1fc4f141f /net/packet/af_packet.c | |
| parent | l2tp_eth: allow to set a specific mac address (diff) | |
| parent | sched: introduce vlan action (diff) | |
| download | linux-df6ce47091620d76bbe036d0af3dc1abad4576c1.tar.xz linux-df6ce47091620d76bbe036d0af3dc1abad4576c1.zip | |
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>
Diffstat (limited to 'net/packet/af_packet.c')
0 files changed, 0 insertions, 0 deletions