From: Olof Johansson <olof@lixom.net>
Date: Fri, 4 Jan 2019 22:30:36 +0000 (-0800)
Subject: Merge branch 'next/drivers' into next/late
X-Git-Tag: v5.0-rc1~34^2
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/00f8ccd0c95f4e604297057a5bccec86c0903d14?hp=-c

Merge branch 'next/drivers' into next/late

Merge in a few missing patches from the pull request (my copy of the
branch was behind the staged version in linux-next).

* next/drivers:
  memory: pl353: Add driver for arm pl353 static memory controller
  dt-bindings: memory: Add pl353 smc controller devicetree binding information
  firmware: qcom: scm: fix compilation error when disabled

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

00f8ccd0c95f4e604297057a5bccec86c0903d14