Merge tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 12:56:34 +0000 (14:56 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 12:56:34 +0000 (14:56 +0200)
commit800daa61a3f20d7ea2243621985ff5744eb2f246
tree389fdecc4d80b0b45900c616954b538c904339c6
parent04b6d0a30082836741c60db6150bcdc73c95afaa
parentabee8fbf2b2170efa0956ce1942ebe777a94cfdd
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