tree 43fb239c5f63a3ae5bfea75b639aff9e8816aef5
parent 0a14fe6e5efd0af0f9c6c01e0433445d615d0110
parent 7bc301e97b96597df967f11b9fa9cf391109893a
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1174531532 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1174531532 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] tcrypt: Fix error checking for comp allocation
  [CRYPTO] doc: Fix typo in hash example
  [CRYPTO] api: scatterwalk_copychunks() fails to advance through scatterlist