Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[safe/jmp/linux-2.6] / include / net / garp.h
2008-07-06 Patrick McHardyvlan: Add GVRP support
2008-07-06 Patrick McHardynet: Add GARP applicant-only participant