diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-02 15:10:07 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-02 15:10:07 +0100 |
commit | 69c444ba93b76f2da4f23449c72e83521142b243 (patch) | |
tree | 4d460a117b909ed5d38cf01e00b95f01b4bbb68c /Documentation/crypto/architecture.rst | |
parent | 2b022ab7542df60021ab57854b3faaaf42552eaf (diff) | |
parent | 30a7acd573899fd8b8ac39236eff6468b195ac7d (diff) | |
download | linux-69c444ba93b76f2da4f23449c72e83521142b243.tar.gz linux-69c444ba93b76f2da4f23449c72e83521142b243.tar.bz2 linux-69c444ba93b76f2da4f23449c72e83521142b243.zip |
Merge 4.15-rc6 into tty-next
We want the ldisc fix here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/crypto/architecture.rst')
0 files changed, 0 insertions, 0 deletions