Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jul 2010 03:25:44 +0000 (20:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jul 2010 03:25:44 +0000 (20:25 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - avoid NULL dereference


Trivial merge