team: Revert previous two changes.

I didn't notice that these were superceded by a more uptodate
version of the changes.

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

diff --cc drivers/net/team/team_mode_activebackup.c
Simple merge

diff --cc drivers/net/team/team_mode_loadbalance.c
Simple merge