From: Tony Lindgren <tony@atomide.com>
Date: Fri, 16 Dec 2011 22:00:23 +0000 (-0800)
Subject: Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9d297f5ee1b92a84e2cd6c547c3ac1f893128359;p=deliverable%2Flinux.git

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

Conflicts:
	arch/arm/mach-omap2/Makefile
---

9d297f5ee1b92a84e2cd6c547c3ac1f893128359
diff --cc arch/arm/mach-omap2/omap_hwmod.c
index f673f808725f,7ea3df517d2b..ee9416bcc3e6
--- a/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"