diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-03 02:39:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-03 02:39:19 -0400 |
| commit | 75348fc915c1bf57b0382394d0b3298695bc9cf9 (patch) | |
| tree | 69cf01ecc7d37eb727edaeb6668983a0ddb04e6c /net/sched/sch_sfb.c | |
| parent | 014b20133bcd442db554c2d2d86181b34cd15b66 (diff) | |
| parent | 57c5bc9ad7d799e9507ba6e993398d2c55f03fab (diff) | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_sfb.c')
0 files changed, 0 insertions, 0 deletions