Merge branch 'next/drivers' into next/late
authorOlof Johansson <olof@lixom.net>
Fri, 4 Jan 2019 22:30:36 +0000 (14:30 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 4 Jan 2019 22:31:38 +0000 (14:31 -0800)
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>

Trivial merge