diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 15:56:34 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 15:56:34 +0300 |
commit | 800daa61a3f20d7ea2243621985ff5744eb2f246 (patch) | |
tree | 389fdecc4d80b0b45900c616954b538c904339c6 /arch/arm/mach-omap2/omap_opp_data.h | |
parent | 04b6d0a30082836741c60db6150bcdc73c95afaa (diff) | |
parent | abee8fbf2b2170efa0956ce1942ebe777a94cfdd (diff) | |
download | linux-800daa61a3f20d7ea2243621985ff5744eb2f246.tar.xz |
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
Diffstat (limited to 'arch/arm/mach-omap2/omap_opp_data.h')
0 files changed, 0 insertions, 0 deletions