Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[linux-2.6] / arch / i386 / crypto /
drwxr-xr-x   ..
-rw-r--r-- 148 Makefile
-rw-r--r-- 10905 aes-i586-asm.S
-rw-r--r-- 13466 aes.c