Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
commitff2bad5f899421850f7e9bc956450e4c61b0b95d
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Jan 2009 15:46:29 +0000 (27 07:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Jan 2009 15:46:29 +0000 (27 07:46 -0800)
tree739acb3863f185a21a870dda6f50bfdc1c241044
parent78d70d48132ce4c678a95b771ffa1af4fb5a03ec
parent516280e735b034216de97eb7ba080ec6acbfc58f
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ccm - Fix handling of null assoc data
  crypto: blkcipher - Fix WARN_ON handling in walk_done
  crypto: authenc - Fix zero-length IV crash