Merge tag 'hix5hd2-config-for-3.19' of git://github.com/hisilicon/linux-hisi into...
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 22:14:46 +0000 (23:14 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 22:14:46 +0000 (23:14 +0100)
commit4fa0ff8c5b3e1300648b910c73a65b66068616d4
tree4df7bd854d490ce7ba7e887d9ece85b81005bd36
parentbdc5be0d00f1c6c1f43b65849e2152a9a39410c5
parentc56a3fbb811d51a810f97a1aca00d37840509b68
Merge tag 'hix5hd2-config-for-3.19' of git://github.com/hisilicon/linux-hisi into next/defconfig

Pull "ARM: HiX5HD2: config update for 3.19" from Wei Xu:

- Enable GMAC, GPIO, Reset, USB, MMC and SATA on HiX5HD2

* tag 'hix5hd2-config-for-3.19' of git://github.com/hisilicon/linux-hisi:
  ARM: hisi_defconfig: add driver support for hix5hd2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>