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)
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

1  2 
arch/arm/configs/multi_v7_defconfig

Simple merge