Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[safe/jmp/linux-2.6] / include / linux / l2tp.h
2010-04-03 James Chapmanl2tp: Add netlink control API for L2TP
2010-04-03 James Chapmanl2tp: Add L2TPv3 IP encapsulation (no UDP) support