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)
commit00f8ccd0c95f4e604297057a5bccec86c0903d14
tree3ef930b38f7341be627da106f6ec31a007c207e4
parent8e564895c30ca73cd9788aecb845879ddee987c3
parent3e730e858139c3bed9587ca50ce0f2aa12fe9523
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>