Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 15:26:09 +0000 (08:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 15:26:09 +0000 (08:26 -0700)
commita231a1f2714ce3b28445ac512a556d6c95517dab
treecb568f1f155e2bc6bb89fa32917bb52e4ebb6308
parent0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a
parent180ce7e81030e1ef763d58f97f9ab840ff57d848
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: authenc - Add EINPROGRESS check