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)
commit042bd1ff6cf255e71689db913786dbb6bb79542d
treedbc4b4da7f34a4de52156d67588ad90fb9d447d7
parent2f7989efd4398d92b8adffce2e07dd043a0895fe
parent2716fbf63ee39eadc1aa9b3841b20f75b99a9bc3
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - avoid NULL dereference