merge by hand - fix up rejections in Documentation/DocBook/Makefile
[pandora-kernel.git] / crypto / serpent.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2