Merge tag 'v3.8-rc6' into next/soc
Olof Johansson [Tue, 5 Feb 2013 06:56:41 +0000 (22:56 -0800)]
Linux 3.8-rc6

12 files changed:
1  2 
MAINTAINERS
arch/arm/boot/dts/Makefile
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/clk-imx27.c
arch/arm/mach-imx/clk-imx31.c
arch/arm/mach-imx/clk-imx35.c
arch/arm/mach-imx/clk-imx6q.c
arch/arm/mach-imx/common.h
arch/arm/mach-imx/platsmp.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/timer.c
drivers/mfd/db8500-prcmu.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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);
Simple merge
Simple merge
Simple merge