Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Feb 2011 17:04:41 +0000 (09:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Feb 2011 17:04:41 +0000 (09:04 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: sha-s390 - Reset index after processing partial block


Trivial merge