| commit | 75348fc915c1bf57b0382394d0b3298695bc9cf9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jun 02 23:39:19 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jun 02 23:39:19 2014 -0700 |
| tree | 69cf01ecc7d37eb727edaeb6668983a0ddb04e6c | |
| 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>