Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Herbert Xu [Mon, 3 May 2010 03:28:58 +0000 (11:28 +0800)]
1  2 
arch/arm/mach-omap2/clock2420_data.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/devices.c
crypto/algapi.c
crypto/tcrypt.c
drivers/crypto/mv_cesa.c
kernel/padata.c

Simple merge
Simple merge
Simple merge
diff --cc crypto/algapi.c
Simple merge
diff --cc crypto/tcrypt.c
Simple merge
  #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