linux-sg2042/drivers/net/team
David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-03 23:32:12 -07:00
..
Kconfig team: introduce random mode 2013-03-06 14:55:20 -05:00
Makefile team: introduce random mode 2013-03-06 14:55:20 -05:00
team.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-03 23:32:12 -07:00
team_mode_activebackup.c team: ab: set active port option as changed when port is leaving 2013-02-04 14:55:45 -05:00
team_mode_broadcast.c team: introduce two default team_modeop functions and use them in modes 2013-03-06 14:55:20 -05:00
team_mode_loadbalance.c team: lb: use sizeof(*fprog) in __fprog_create 2014-05-24 17:06:38 -04:00
team_mode_random.c random32: add prandom_u32_max and convert open coded users 2014-01-21 23:17:20 -08:00
team_mode_roundrobin.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-06-19 16:49:39 -07:00