Merge tag 'arm-soc/for-4.12/defconfig' of http://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Fri, 31 Mar 2017 09:00:13 +0000 (11:00 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 31 Mar 2017 09:00:13 +0000 (11:00 +0200)
commitf30c110dc2cd7a4004ea0b0b4e8f6ec0187f7150
tree8eac6addcfb7584f3610f34a364aa71af6c95424
parent7012d8c48be6537a05511c5833f41105e8c78c39
parentf880c8fd8cfb3bcb77a219c00de45ad0a8386d23
Merge tag 'arm-soc/for-4.12/defconfig' of github.com/Broadcom/stblinux into next/defconfig

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

This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.12,
please pull the following:

- Gerd enables the BCM2835 MMC driver which yields better performance than the
  default one (iProc)

* tag 'arm-soc/for-4.12/defconfig' of http://github.com/Broadcom/stblinux:
  arm: set CONFIG_MMC_BCM2835=y in bcm2835_defconfig and multi_v7_defconfig
  ARM: bcm2835: Enable missing CMA settings for VC4 driver