Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge crypto tree to pick up the scompress scratch refcount fix.  The
merge resolution is slightly non-trivial as the context has shifted.

diff --cc crypto/scompress.c
index 8db4613150e05dd9fa17eecd28681b12dc7ac0af,ffeedcf20b0f1802581537bbb8d9a615c9ed09bb..15148c58d648578fe8b4a988544dfa7162a0ff39
--- 1/crypto/scompress.c
--- 2/crypto/scompress.c
+++ b/crypto/scompress.c
@@@ -125,14 -158,15 +125,13 @@@ static int crypto_scomp_init_tfm(struc
        int ret = 0;
  
        mutex_lock(&scomp_lock);
 -      if (!alg->stream) {
 -              ret = scomp_alloc_streams(alg);
 -              if (ret)
 -                      goto unlock;
 -      }
 +      ret = crypto_acomp_alloc_streams(&alg->streams);
 +      if (ret)
 +              goto unlock;
-       if (!scomp_scratch_users) {
+       if (!scomp_scratch_users++) {
                ret = crypto_scomp_alloc_scratches();
                if (ret)
-                       goto unlock;
-               scomp_scratch_users++;
+                       scomp_scratch_users--;
        }
  unlock:
        mutex_unlock(&scomp_lock);