OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 014b201 57c5bc9)
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)
commit75348fc915c1bf57b0382394d0b3298695bc9cf9
tree69cf01ecc7d37eb727edaeb6668983a0ddb04e6ctree | snapshot
parent014b20133bcd442db554c2d2d86181b34cd15b66commit | diff
parent57c5bc9ad7d799e9507ba6e993398d2c55f03fabcommit | 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>
About OSDN
Find Software
Develop Software
Help