Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git] / crypto / seqiv.c
diff --cc crypto/seqiv.c
Simple merge