Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
f40d1e42bb
linux/net/l2tp
History
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>
2012-09-28 14:40:49 -04:00
..
Kconfig l2tp: fix compile error when CONFIG_IPV6=m and CONFIG_L2TP=y 2012-09-21 12:06:46 -04:00
l2tp_core.c l2tp: fix a lockdep splat 2012-09-04 14:07:50 -04:00
l2tp_core.h l2tp: avoid to use synchronize_rcu in tunnel free function 2012-08-30 12:31:03 -04:00
l2tp_debugfs.c net: l2tp: Standardize logging styles 2012-05-17 04:34:38 -04:00
l2tp_eth.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-15 11:43:53 -04:00
l2tp_ip6.c l2tp: fix info leak via getsockname() 2012-08-15 21:36:31 -07:00
l2tp_ip.c l2tp: fix a race in l2tp_ip_sendmsg() 2012-06-08 14:30:51 -07:00
l2tp_netlink.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -04:00
l2tp_ppp.c net: Remove casts to same type 2012-06-04 11:45:11 -04:00
Makefile l2tp: introduce L2TPv3 IP encapsulation support for IPv6 2012-05-01 09:30:55 -04:00