Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-mmc.git
[linux-2.6] / net / 8021q / vlan.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2