Merge linux-2.6 into linux-acpi-2.6 test
[sfrench/cifs-2.6.git] / include / net / llc_if.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2