From: Tony Lindgren <tony@atomide.com>
Date: Tue, 13 Nov 2012 21:25:38 +0000 (-0800)
Subject: Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
X-Git-Tag: v3.8-rc1~136^2~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89ab216b33ba9405880fd3d89531305a931bc70f;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
---

89ab216b33ba9405880fd3d89531305a931bc70f
diff --cc arch/arm/mach-omap2/voltagedomains44xx_data.c
index c3115f6,b893c8e..48b22a0
--- a/arch/arm/mach-omap2/voltagedomains44xx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c
@@@ -22,7 -22,7 +22,7 @@@
  #include <linux/init.h>
  
  #include "common.h"
--
++#include "soc.h"
  #include "prm-regbits-44xx.h"
  #include "prm44xx.h"
  #include "prcm44xx.h"