diff options
author | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:32:48 +0200 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:32:48 +0200 |
commit | 9cab3a1a9660ed5f798b063aa7e827eb0c95ba94 (patch) | |
tree | fb5dadde55ce30a6634f113bb6ca35682833ecf3 /include/asm-parisc | |
parent | a6d3a923924a7b751981d93ade82854985abebba (diff) | |
parent | 3d758323280763fe59b1f61d4f86aa2a29fe3775 (diff) | |
download | kernel-crypto-9cab3a1a9660ed5f798b063aa7e827eb0c95ba94.tar.gz kernel-crypto-9cab3a1a9660ed5f798b063aa7e827eb0c95ba94.tar.xz kernel-crypto-9cab3a1a9660ed5f798b063aa7e827eb0c95ba94.zip |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
TODO
crypto.4
examples/Makefile
examples/ncr.c
examples/pk.c
examples/speed.c
include/linux/cryptodev.h
userspace/setkey.c
Diffstat (limited to 'include/asm-parisc')
0 files changed, 0 insertions, 0 deletions