From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 25 Apr 2016 19:11:13 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ccb0f688ea60b0b0128f3796f58879954c260f2f;p=linux-beck.git

Merge tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig

Merge "This pull request contains defconfig changes for Broadcom ARM-based SoCs"
from Florian Fainelli:

- Eric enables more BCM2835 peripherals in multi_v7_defconfig: watchdog, I2S,
  switches from the sdhci-bcm2835 to the sdhci-iproc driver, DWC2 USB controller

- Eric also enables more BCM2835 peripherals in bcm2835_defconfig: VC4, NFS root
  Power Management support, switching sdhci-bcm2835 for sdhci-iproc

* tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: bcm2835: Enable NFS root support.
  ARM: bcm2835: Enable the VC4 graphics driver in the defconfig
  ARM: bcm2835: Enable CONFIG_PM.
  ARM: bcm2835: Switch BCM2835 to sdhci-iproc.c for MMC
  ARM: multi_v7_defconfig: Build in DWC2 USB support
  ARM: multi_v7_defconfig: Switch BCM2835 to sdhci-iproc.c for MMC
  ARM: multi_v7_defconfig: Add more BCM2835 support
---

ccb0f688ea60b0b0128f3796f58879954c260f2f