From: Linus Torvalds 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: firefly_0821_release~35978 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bd5838b9ccdde2be18f61886c41ccd131414fb04;p=firefly-linux-kernel-4.4.55.git 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 --- bd5838b9ccdde2be18f61886c41ccd131414fb04