From: David S. Miller <davem@davemloft.net>
Date: Tue, 3 Jun 2014 06:39:19 +0000 (-0700)
Subject: Merge branch 'hsilicon'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=75348fc915c1bf57b0382394d0b3298695bc9cf9;p=deliverable%2Flinux.git

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>
---

75348fc915c1bf57b0382394d0b3298695bc9cf9