diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-15 22:43:21 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-15 22:43:21 +0300 |
| commit | 2295cddf99e3f7c2be2b1160e2f5e53cc35b09be (patch) | |
| tree | 2c5a619c8aee5ef68028a65a1c059736b005846b /drivers/net/ethernet/ti/tlan.c | |
| parent | 346e320cb2103edef709c4466a29140c4a8e527a (diff) | |
| parent | 2ecbc1f684482b4ed52447a39903bd9b0f222898 (diff) | |
| download | linux-2295cddf99e3f7c2be2b1160e2f5e53cc35b09be.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflicts in net/mptcp/protocol.h and
tools/testing/selftests/net/Makefile.
In both cases code was added on both sides in the same place
so just keep both.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/ti/tlan.c')
| -rw-r--r-- | drivers/net/ethernet/ti/tlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c index 317fad787d78..267c080ee084 100644 --- a/drivers/net/ethernet/ti/tlan.c +++ b/drivers/net/ethernet/ti/tlan.c @@ -2504,7 +2504,7 @@ static void tlan_phy_power_down(struct net_device *dev) } /* Wait for 50 ms and powerup - * This is abitrary. It is intended to make sure the + * This is arbitrary. It is intended to make sure the * transceiver settles. */ tlan_set_timer(dev, msecs_to_jiffies(50), TLAN_TIMER_PHY_PUP); |