diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-23 20:28:32 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-23 20:28:32 +0200 |
| commit | b3fcd1e159bf7bd5b318d4558198fca090deb2fe (patch) | |
| tree | d1821ce0be2ede05bc3417bcba2ace0e2002e250 /.gitignore | |
| parent | c3eeccf6491c632037dfef737f3e40ed24e5bf72 (diff) | |
| parent | a3fe06856efe0a7b4ad713ff73a14f6af995d07e (diff) | |
| download | cryptodev-linux-integration.tar.gz cryptodev-linux-integration.tar.xz cryptodev-linux-integration.zip | |
Merge branch 'userspace' into integrationintegration
Conflicts:
examples/Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -8,10 +8,15 @@ Module.symvers *.mod.c modules.order examples/ncr +examples/ncr_lib examples/pk +examples/pk_lib examples/speed releases scripts userspace/ncr-setkey +userspace/libcryptodev.so +userspace/libcryptodev.so.* +userspace/linux version.h tags |