diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-06-02 23:39:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-02 23:39:19 -0700 |
| commit | 75348fc915c1bf57b0382394d0b3298695bc9cf9 (patch) | |
| tree | 69cf01ecc7d37eb727edaeb6668983a0ddb04e6c /drivers/net/ethernet/nxp | |
| parent | Merge branch 'ethtool-rssh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/net-next (diff) | |
| parent | net: hisilicon: add hix5hd2 mac driver (diff) | |
| download | linux-dev-75348fc915c1bf57b0382394d0b3298695bc9cf9.tar.xz linux-dev-75348fc915c1bf57b0382394d0b3298695bc9cf9.zip | |
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 'drivers/net/ethernet/nxp')
0 files changed, 0 insertions, 0 deletions