Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 14:45:57 +0000 (07:45 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 14:45:57 +0000 (07:45 -0700)
commitbd5838b9ccdde2be18f61886c41ccd131414fb04
tree0e74a2bf9033ef79b76d447bdc3de10839af1888
parentc86d90df2676d9d212c0ab1f3c64e0abdf5b4c09
parent85ca719e5756d79ea0f10c469e3762462ac45e22
Merge /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