David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-12-17 22:08:28 -05:00

..

bsd_comp.c

…

Kconfig

Merge tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

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: declare ppp devices as enumerated interfaces

2015-12-14 16:20:57 -05: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-17 22:08:28 -05:00

pppox.c

pppox: use standard module auto-loading feature

2015-12-03 15:12:54 -05:00

pptp.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-17 22:08:28 -05:00