From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 3 May 2010 03:28:58 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=df2071bd081408318d659cd14a9cf6ff23d874c9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge git://git./linux/kernel/git/torvalds/linux-2.6
---

df2071bd081408318d659cd14a9cf6ff23d874c9
diff --cc drivers/crypto/mv_cesa.c
index 1cee5a937092,6f29012bcc43..18a436cafc10
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@@ -14,14 -14,9 +14,15 @@@
  #include <linux/kthread.h>
  #include <linux/platform_device.h>
  #include <linux/scatterlist.h>
+ #include <linux/slab.h>
 +#include <crypto/internal/hash.h>
 +#include <crypto/sha.h>
  
  #include "mv_cesa.h"
 +
 +#define MV_CESA	"MV-CESA:"
 +#define MAX_HW_HASH_SIZE	0xFFFF
 +
  /*
   * STM:
   *   /---------------------------------------\