Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Jul 2010 18:45:23 +0000 (11:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Jul 2010 18:45:23 +0000 (11:45 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: talitos - fix bug in sg_copy_end_to_buffer


Trivial merge