diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-19 04:24:16 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-19 04:24:16 +0900 |
commit | 7553c7e68fd144643e74a279ef51b74a15214071 (patch) | |
tree | 5ad08f6de205a14eeba1793aa641e6b25c22b2c1 /crypto/chacha20_generic.c | |
parent | 423de92f56bdfc3e68503af31e6ec041d59a6a25 (diff) | |
parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
download | linux-stable-7553c7e68fd144643e74a279ef51b74a15214071.tar.gz linux-stable-7553c7e68fd144643e74a279ef51b74a15214071.tar.bz2 linux-stable-7553c7e68fd144643e74a279ef51b74a15214071.zip |
Merge 4.6-rc4 into char-misc-next
We want the fixes in there to build off of for other dependant patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto/chacha20_generic.c')
0 files changed, 0 insertions, 0 deletions