From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 26 Apr 2006 14:45:57 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc3~12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bd5838b9ccdde2be18f61886c41ccd131414fb04;p=~emulex%2Finfiniband.git

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
---

bd5838b9ccdde2be18f61886c41ccd131414fb04