diff options
author | Olof Johansson <olof@lixom.net> | 2020-03-02 20:54:24 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2020-03-02 20:54:59 +0100 |
commit | 0b86b258e644c5f547005654cde0913d9e2ab5bc (patch) | |
tree | fbbf6dddbb29a0a0e64a761b1400443eb225f317 /drivers/watchdog/txx9wdt.c | |
parent | Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | ARM: bcm2835_defconfig: Explicitly restore CONFIG_DEBUG_FS (diff) | |
download | linux-0b86b258e644c5f547005654cde0913d9e2ab5bc.tar.xz linux-0b86b258e644c5f547005654cde0913d9e2ab5bc.zip |
Merge tag 'arm-soc/for-5.6/defconfig-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-based SoCs defconfig file(s)
fixes for v5.6, please pull the following:
- Stefan restores CONFIG_DEBUG_FS from the bcm2835_defconfig which was
accidentally removed
* tag 'arm-soc/for-5.6/defconfig-fixes' of https://github.com/Broadcom/stblinux:
ARM: bcm2835_defconfig: Explicitly restore CONFIG_DEBUG_FS
Link: https://lore.kernel.org/r/20200302195043.14513-1-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/watchdog/txx9wdt.c')
0 files changed, 0 insertions, 0 deletions