Skip to content
Commit 432bc230 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hsr-next'



Murali Karicheri says:

====================
net: hsr: updates from internal tree

This series picks commit from our internal kernel tree.
Patch 1/3 fixes a file name issue introduced in my previous
series.

History:
  v2: fixed patch 3/3 by moving stats update to inside hsr_forward_skb()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dcdecdcf ee2c46f3
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment