From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 7 Jul 2016 12:56:34 +0000 (+0200)
Subject: Merge tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=800daa61a3f20d7ea2243621985ff5744eb2f246;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi into next/soc

Merge "ARM: mach-hisi: Hisilicon SoC updates for 4.8" from Wei Xu:

- Consolidate the hisilicon armv7 SoCs machine entries
- Avoid the compiling warning by making unexported symbols static

* tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi:
  ARM: hisi: consolidate the hisilicon machine entries
  ARM: hisi: make unexported symbols static
---

800daa61a3f20d7ea2243621985ff5744eb2f246