]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'hsilicon'
authorDavid S. Miller <davem@davemloft.net>
Tue, 3 Jun 2014 06:39:19 +0000 (23:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Jun 2014 06:39:19 +0000 (23:39 -0700)
commitc597bde6258b7dfec5f49e72fb47997cbfd2997c
tree69cf01ecc7d37eb727edaeb6668983a0ddb04e6c
parentd3537100cb1aba219d33aebad07184bbf1d969e7
parentbb37f2c9208bd6748b72418ba39caa0663e8ea54
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>