Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into...

Conflicts:
	arch/arm/mach-omap2/Makefile

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
index f673f808725f730a8ad1e27eff9e1e4abc43eea8,7ea3df517d2b53f36263df2e747daf4e8f19fa1d..ee9416bcc3e6072c1777ea9397ffb5578832827b
--- 1/arch/arm/mach-omap2/omap_hwmod.c
--- 2/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@@ -136,8 -136,9 +136,9 @@@
  #include <linux/list.h>
  #include <linux/mutex.h>
  #include <linux/spinlock.h>
+ #include <linux/slab.h>
  
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/cpu.h>
  #include "clockdomain.h"
  #include "powerdomain.h"

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

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

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

diff --cc arch/arm/plat-omap/include/plat/omap_hwmod.h
Simple merge