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

Trivial merge