Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-3.10.git] / include / net / gre.h
2010-08-22 Dmitry Kozlov PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)