diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-14 06:45:44 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-14 06:45:44 -0700 |
commit | b4bf665c5761837f693e87ab27870a5868185ccc (patch) | |
tree | 5c48b5e305a0ec572fb7d4538ad0bde51171a543 /drivers/net/macvlan.c | |
parent | dad1e54b121d93ed47690d77736af63d3f11d657 (diff) |
virtio_net: Fix mis-merge.
Pointed out by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
0 files changed, 0 insertions, 0 deletions