You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		13 years ago
..
Kconfig	l2tp: fix compile error when CONFIG_IPV6=m and CONFIG_L2TP=y	13 years ago
Makefile	…
l2tp_core.c	l2tp: fix a lockdep splat	13 years ago
l2tp_core.h	l2tp: avoid to use synchronize_rcu in tunnel free function	13 years ago
l2tp_debugfs.c	…
l2tp_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
l2tp_ip.c	…
l2tp_ip6.c	…
l2tp_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
l2tp_ppp.c	…