projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
014b201
57c5bc9
)
Merge branch 'hsilicon'
author
David S. Miller
<davem@davemloft.net>
Tue, 3 Jun 2014 06:39:19 +0000
(23:39 -0700)
committer
David S. Miller
<davem@davemloft.net>
Tue, 3 Jun 2014 06:39:19 +0000
(23:39 -0700)
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: David S. Miller <davem@davemloft.net>
Trivial merge