kernel_optimize_test/net/l2tp
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
Kconfig
l2tp_core.c
l2tp_core.h
l2tp_debugfs.c
l2tp_eth.c
l2tp_ip.c
l2tp_ip6.c
l2tp_netlink.c
l2tp_ppp.c
Makefile