forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/include/crypto/internal
History
Amit Pundir 24740dab5c Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Conflicts:
    fs/f2fs/extent_cache.c
        Pick changes from AOSP Change-Id: Icd8a85ac0c19a8aa25cd2591a12b4e9b85bdf1c5
        ("f2fs: catch up to v4.14-rc1")

    fs/f2fs/namei.c
        Pick changes from AOSP F2FS backport commit 7d5c08fd91
        ("f2fs: backport from (4c1fad64 - Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")
2018-03-05 20:20:17 +05:30
..
aead.h crypto: aead - Remove old AEAD interfaces 2015-08-17 16:53:50 +08:00
akcipher.h crypto: akcipher - add PKE API 2015-06-17 17:03:14 +08:00
compress.h crypto: compress - Add pcomp interface 2009-03-04 15:05:33 +08:00
geniv.h crypto: aead - Remove old AEAD interfaces 2015-08-17 16:53:50 +08:00
hash.h Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2018-03-05 20:20:17 +05:30
rng.h crypto: rng - Do not free default RNG when it becomes unused 2015-06-22 15:49:18 +08:00
rsa.h crypto: akcipher - Changes to asymmetric key API 2015-10-14 22:23:16 +08:00
skcipher.h crypto: skcipher - Add top-level skcipher interface 2015-08-21 22:21:19 +08:00