Merge tag 'qcom-defconfig-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 6 Nov 2019 22:05:21 +0000 (14:05 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 6 Nov 2019 22:05:22 +0000 (14:05 -0800)
Qualcomm ARM Based defconfig Updates for v5.5

* Enable OCMEM support

* tag 'qcom-defconfig-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: qcom_defconfig: add ocmem support

Link: https://lore.kernel.org/r/1573068840-13098-3-git-send-email-agross@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge