David S. Miller ba3e2084f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv6/xfrm6_output.c net/openvswitch/flow_netlink.c net/openvswitch/vport-gre.c net/openvswitch/vport-vxlan.c net/openvswitch/vport.c net/openvswitch/vport.h The openvswitch conflicts were overlapping changes. One was the egress tunnel info fix in 'net' and the other was the vport ->send() op simplification in 'net-next'. The xfrm6_output.c conflicts was also a simplification overlapping a bug fix. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-24 06:54:12 -07:00
..
bsd_comp.c
Kconfig	tty/serial patches for 3.9-rc1	2013-02-21 13:41:04 -08:00
Makefile
ppp_async.c	tty: Fix recursive deadlock in tty_perform_flush()	2013-03-18 16:52:24 -07:00
ppp_deflate.c	ppp: deflate: never return len larger than output buffer	2015-01-29 14:50:01 -08:00
ppp_generic.c	ppp: fix lockdep splat in ppp_dev_uninit()	2015-09-25 12:38:11 -07:00
ppp_mppe.c	ppp: mppe: discard late packet in stateless mode	2015-04-26 23:25:13 -04:00
ppp_mppe.h
ppp_synctty.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
pppoe.c	ppp: fix pppoe_dev deletion condition in pppoe_release()	2015-10-23 03:30:01 -07:00
pppox.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
pptp.c	ipv4, ipv6: Pass net into ip_local_out and ip6_local_out	2015-10-08 04:27:02 -07:00