OSDN Git Service

Merge tag 'arm-soc/for-4.15/defconfig' of http://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 10:02:01 +0000 (11:02 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 10:02:01 +0000 (11:02 +0100)
commit688de98f3488b55b333601030c790a923183169d
treee2dd246b7630082ba037860e7dc2e3edadf31061
parent4ba845dad9b90ca9137cdfec3d61cb8c7002f033
parent675a157c61f756affbbc2569c55dc5719342081b
Merge tag 'arm-soc/for-4.15/defconfig' of github.com/Broadcom/stblinux into next/soc

Pull "Broadcom defconfig changes for 4.15" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoCs multi_v7_defconfig file
updates for 4.15, please pull the following:

- Florian enables the Broadcom Hurricane 2 SoC in multi_v7_defconfig
  (CONFIG_ARCH_BCM_HR2)

* tag 'arm-soc/for-4.15/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Enable CONFIG_ARCH_BCM_HR2
arch/arm/configs/multi_v7_defconfig