Merge tag 'arm-soc/for-4.10/defconfig' of http://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Wed, 30 Nov 2016 21:21:51 +0000 (22:21 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 30 Nov 2016 21:21:51 +0000 (22:21 +0100)
commitb32c9b89ad7495e0b7327bf1815efa6849855604
treeeedc9f2be3ee0ac151c59c5fa41f2c8e6a054066
parentc2d3925456766fa1b8f85cb3f83140914647c794
parent33c037c51be5df857ae563f7fc551dc6e746d9de
Merge tag 'arm-soc/for-4.10/defconfig' of github.com/Broadcom/stblinux into next/defconfig

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

This pull request contains Broadcom ARM-based defconfig changes for 4.10, please
pull the following:

- Florian updates the multi_v7_defconfig with the relevant basic drivers needed
  for the Broadcom BCM5301x (Northstar) SoCs to reboot, have PCIe, and Ethernet

- Martin enables the Raspberry Pi thermal driver in bcm2835_defconfig

* tag 'arm-soc/for-4.10/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: bcm2835: add thermal driver to default config
  ARM: multi_v7_defconfig: Enable BCM47xx/BCM5301x drivers
arch/arm/configs/multi_v7_defconfig