diff options
| author | Olof Johansson <olof@lixom.net> | 2019-01-05 01:30:36 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-01-05 01:31:38 +0300 |
| commit | 00f8ccd0c95f4e604297057a5bccec86c0903d14 (patch) | |
| tree | 3ef930b38f7341be627da106f6ec31a007c207e4 /crypto/tcrypt.c | |
| parent | 8e564895c30ca73cd9788aecb845879ddee987c3 (diff) | |
| parent | 3e730e858139c3bed9587ca50ce0f2aa12fe9523 (diff) | |
| download | linux-00f8ccd0c95f4e604297057a5bccec86c0903d14.tar.xz | |
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>
Diffstat (limited to 'crypto/tcrypt.c')
0 files changed, 0 insertions, 0 deletions