tree e83d99cf672299bffd338f11d0b3536f654488ee
parent d38e84ee39783e00bd0b83a8dd19e54709950912
parent bb402f16ecf9bcdb944b8fa730f0e43cae519673
author Linus Torvalds <torvalds@linux-foundation.org> 1235428700 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235428700 -0800

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:
  crypto: ahash - Fix digest size in /proc/crypto