diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 07:45:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 07:45:57 -0700 |
commit | bd5838b9ccdde2be18f61886c41ccd131414fb04 (patch) | |
tree | 0e74a2bf9033ef79b76d447bdc3de10839af1888 /drivers/net/skfp/can.c | |
parent | c86d90df2676d9d212c0ab1f3c64e0abdf5b4c09 (diff) | |
parent | 85ca719e5756d79ea0f10c469e3762462ac45e22 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[BRIDGE]: allow full size vlan packets
Diffstat (limited to 'drivers/net/skfp/can.c')
0 files changed, 0 insertions, 0 deletions