From: Olof Johansson <olof@lixom.net>
Date: Tue, 5 Feb 2013 06:56:41 +0000 (-0800)
Subject: Merge tag 'v3.8-rc6' into next/soc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=469da62096e23adc755c1268b00b5fc7a214151b;p=linux-beck.git

Merge tag 'v3.8-rc6' into next/soc

Linux 3.8-rc6
---

469da62096e23adc755c1268b00b5fc7a214151b
diff --cc arch/arm/mach-imx/common.h
index 166e6d5ce42a,fa36fb84ab19..5a800bfcec5b
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@@ -130,9 -139,10 +130,10 @@@ extern void imx_gpc_init(void)
  extern void imx_gpc_pre_suspend(void);
  extern void imx_gpc_post_resume(void);
  extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
 -extern void imx6q_clock_map_io(void);
 +extern void imx6q_set_chicken_bit(void);
  
  extern void imx_cpu_die(unsigned int cpu);
+ extern int imx_cpu_kill(unsigned int cpu);
  
  #ifdef CONFIG_PM
  extern void imx6q_pm_init(void);