diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 21:07:19 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 21:07:19 +0200 |
| commit | 7cc28b8bafe112037edae18ea0e590e7c9d074fa (patch) | |
| tree | 5836f1f9cdd22d731e986ea4f8ed73649bf7b6e4 /scripts/basic/split-include.c | |
| parent | da3eeeff5744e8ea4bcdb819db3afad6437f5231 (diff) | |
| parent | a04fd1aa4f807e2f97632a46070306e1389264ed (diff) | |
| download | kernel-crypto-7cc28b8bafe112037edae18ea0e590e7c9d074fa.tar.gz kernel-crypto-7cc28b8bafe112037edae18ea0e590e7c9d074fa.tar.xz kernel-crypto-7cc28b8bafe112037edae18ea0e590e7c9d074fa.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Conflicts:
crypto/userspace/Makefile
crypto/userspace/ncr-data.c
crypto/userspace/ncr-key-storage.c
crypto/userspace/ncr-key-wrap.c
crypto/userspace/ncr-key.c
crypto/userspace/ncr-limits.c
crypto/userspace/ncr-pk.c
crypto/userspace/ncr-sessions.c
crypto/userspace/ncr.c
Diffstat (limited to 'scripts/basic/split-include.c')
0 files changed, 0 insertions, 0 deletions