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

diff --cc arch/arm/mach-omap2/clock2420_data.c
Simple merge

diff --cc arch/arm/mach-omap2/clock3xxx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc crypto/algapi.c
Simple merge

diff --cc crypto/tcrypt.c
Simple merge

diff --cc drivers/crypto/mv_cesa.c
index 1cee5a937092678cf12786a277b03b2ce3fe3cbe,6f29012bcc434dbcc1101782072678991d53a509..18a436cafc107f1004cb4686e7ca8946d2f8f2d2
--- 1/drivers/crypto/mv_cesa.c
--- 2/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:
   *   /---------------------------------------\

diff --cc kernel/padata.c
Simple merge