Skip to content
Commit 75348fc9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hsilicon'



Zhangfei Gao says:

====================
add hix5hd2 mac driver

v4:
Update indent
Use usleep_range instead of udelay

v3:
Remove .ndo_get_stats as mentioned by Tobias
Add __le32 conversion pointed by Mark

v2:
Update binding accoring to Sergei comments
Update descriptor as Arnd's suggestion
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 014b2013 57c5bc9a
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment