hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/drivers/net/team
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 team: add support for non-ethernet devices 2012-08-20 02:40:48 -07:00
Makefile team: add broadcast mode 2012-07-12 08:08:20 -07:00
team.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -04:00
team_mode_activebackup.c team: add netpoll support 2012-07-17 09:02:36 -07:00
team_mode_broadcast.c team: add support for non-ethernet devices 2012-08-20 02:40:48 -07:00
team_mode_loadbalance.c team: add netpoll support 2012-07-17 09:02:36 -07:00
team_mode_roundrobin.c team: add support for non-ethernet devices 2012-08-20 02:40:48 -07:00