From: David S. Miller <davem@davemloft.net>
Date: Fri, 1 Jul 2016 20:57:01 +0000 (-0400)
Subject: Merge branch 'hns-next'
X-Git-Tag: v4.8-rc1~140^2~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca9354a1d47d8e30dee114fc946fd71f1d403ca7;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'hns-next'

Yisen Zhuang says:

====================
net: hns: fix the typo of hns

This series includes typo fixes which review by Andy, adding
the hns maintainer to MAINTAINERS, as below:

 > from Daode: adds the maintainer for hns driver;

 > from Daode: fix the typo of hns reviewed by Andy Shevchenko;

 > from Kejian: one remove redundant function and two fix to get
configuration from DT.

changlog:
 v2 -> v3:
  match all files in and below drivers/net/ethernet/hisilicon/

 v1 -> v2:
  fix the indentations reviewed by David.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

ca9354a1d47d8e30dee114fc946fd71f1d403ca7