AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-13 22:16:41 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
8edc0e624d
linux_dsm_epyc7002/drivers/net/ppp
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
..
bsd_comp.c ppp: Move the PPP drivers 2011-08-27 00:58:26 -07:00
Kconfig ppp: Move the PPP drivers 2011-08-27 00:58:26 -07:00
Makefile ppp: Move the PPP drivers 2011-08-27 00:58:26 -07:00
ppp_async.c ppp: avoid false drop_monitor false positives 2012-05-19 02:32:30 -04:00
ppp_deflate.c ppp: Change copyright notices from ANU to me 2012-03-04 20:41:38 -05:00
ppp_generic.c ppp: add 64 bit stats 2012-08-03 20:40:12 -07:00
ppp_mppe.c ppp: Move the PPP drivers 2011-08-27 00:58:26 -07:00
ppp_mppe.h ppp: Move the PPP drivers 2011-08-27 00:58:26 -07:00
ppp_synctty.c ppp: avoid false drop_monitor false positives 2012-05-19 02:32:30 -04:00
pppoe.c pppoe: drop PPPOX_ZOMBIEs in pppoe_release 2012-09-22 15:49:31 -04:00
pppox.c ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h> 2012-03-04 20:41:38 -05:00
pptp.c pptp: lookup route with the proper net namespace 2012-08-08 15:57:10 -07:00