Merge tag 'arm-soc/for-4.20/defconfig' of https://github.com/Broadcom/stblinux into...
authorOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 18:29:40 +0000 (11:29 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 18:29:40 +0000 (11:29 -0700)
commit0626c46e1ec36930e16ead3143b67d6c78b08011
tree33c279338f2f0a083059df1b6cf6397bc32f2e17
parent11da3a7f84f19c26da6f86af878298694ede0804
parent99fa3b0c6082bff346f7d09f29e5edcc93d40bd3
Merge tag 'arm-soc/for-4.20/defconfig' of https://github.com/Broadcom/stblinux into next/defconfig

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

- Stefan updates the bcm2835_defconfig file to turn on the bcm2835-audio
  driver.

* tag 'arm-soc/for-4.20/defconfig' of https://github.com/Broadcom/stblinux:
  ARM: bcm2835_defconfig: Enable bcm2835-audio

Signed-off-by: Olof Johansson <olof@lixom.net>