Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
[pandora-kernel.git] / crypto / tcrypt.c
diff --cc crypto/tcrypt.c
Simple merge