diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-11 19:48:14 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-11 19:48:14 -0800 |
commit | baefc38c7ec56afcfa92594930b747a050c599b7 (patch) | |
tree | 962383f0b460f77f3f40909870186eda06aad39d /crypto/asymmetric_keys/pkcs7_parser.c | |
parent | 126d18a6f67ad8d29388d82a448b178e2ac1a77c (diff) | |
parent | 13a7af2378dfab31fd00e73f1986e92b60e09377 (diff) | |
download | linux-crypto-baefc38c7ec56afcfa92594930b747a050c599b7.tar.gz linux-crypto-baefc38c7ec56afcfa92594930b747a050c599b7.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.
I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_parser.c')
0 files changed, 0 insertions, 0 deletions