OpenCloudOS-Kernel/net/l2tp
David S. Miller 4dc6758d78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-11-10 10:00:18 +09:00
..
Kconfig l2tp: Call udp_sock_create 2014-07-14 16:12:15 -07:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
l2tp_core.c l2tp: remove l2tp_tunnel_count and l2tp_session_count 2017-11-01 10:57:24 +09:00
l2tp_core.h l2tp: remove l2tp specific refcount debugging 2017-11-01 10:57:24 +09:00
l2tp_debugfs.c l2tp: remove ->ref() and ->deref() 2017-11-01 10:57:24 +09:00
l2tp_eth.c l2tp: remove field 'dev' from struct l2tp_eth 2017-11-01 10:57:24 +09:00
l2tp_ip.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-11-10 10:00:18 +09:00
l2tp_ip6.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-11-10 10:00:18 +09:00
l2tp_netlink.c l2tp: remove ->ref() and ->deref() 2017-11-01 10:57:24 +09:00
l2tp_ppp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-11-02 15:23:39 +09:00