tree 44cefef0fdd172ce4fe2083ed7695d86b76ed257
parent a44a553f827f28d46130c9818dbcb95f4262b96c
parent 50b6e71ae83714be509b80727dbf90fa8b1c0717
author Linus Torvalds <torvalds@linux-foundation.org> 1283895316 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1283895316 -0700

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  Revert "hwrng: n2-drv - remove casts from void*"
  crypto: testmgr - Default to no tests
  crypto: testmgr - Fix test disabling option
  crypto: hash - Fix handling of small unaligned buffers